Fix busy loops. (#3392)

node/network/availability-recovery/src/lib.rs

@@ -806,8 +806,8 @@ impl AvailabilityRecoverySubsystem {
 						}
 					}
 				}
-				output = state.interactions.next() => {
-					if let Some((candidate_hash, result)) = output.flatten() {
+				output = state.interactions.select_next_some() => {
+					if let Some((candidate_hash, result)) = output {
 						state.availability_lru.put(candidate_hash, result);
 					}
 				}

node/network/collator-protocol/src/validator_side/mod.rs

@@ -1138,12 +1138,10 @@ pub(crate) async fn run<Context>(
 			_ = next_inactivity_stream.next() => {
 				disconnect_inactive_peers(&mut ctx, &eviction_policy, &state.peer_data).await;
 			}
-			res = state.collation_fetches.next() => {
-				if let Some(res) = res {
+			res = state.collation_fetches.select_next_some() => {
 				handle_collation_fetched_result(&mut ctx, &mut state, res).await;
 			}
 		}
-		}
 
 		let mut retained_requested = HashSet::new();
 		for (pending_collation, per_req) in state.requested_collations.iter_mut() {