s/drain_filter/extract_if/ for Vec, Btree{Map,Set} and LinkedList

Author: the8472

compiler/rustc_errors/src/lib.rs

@@ -4,7 +4,7 @@
 
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![feature(array_windows)]
-#![feature(drain_filter)]
+#![feature(extract_if)]
 #![feature(if_let_guard)]
 #![feature(let_chains)]
 #![feature(never_type)]
@@ -1399,7 +1399,7 @@ impl HandlerInner {
  !self.emitted_diagnostics.insert(diagnostic_hash)
  };
 
- diagnostic.children.drain_filter(already_emitted_sub).for_each(|_| {});
+ diagnostic.children.extract_if(already_emitted_sub).for_each(|_| {});
 
  self.emitter.emit_diagnostic(diagnostic);
  if diagnostic.is_error() {

compiler/rustc_hir_analysis/src/lib.rs

@@ -59,7 +59,6 @@ This API is completely unstable and subject to change.
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![feature(box_patterns)]
 #![feature(control_flow_enum)]
-#![feature(drain_filter)]
 #![feature(hash_drain_filter)]
 #![feature(if_let_guard)]
 #![feature(is_sorted)]

compiler/rustc_hir_typeck/src/lib.rs

@@ -5,7 +5,6 @@
 #![feature(box_patterns)]
 #![feature(min_specialization)]
 #![feature(control_flow_enum)]
-#![feature(drain_filter)]
 #![feature(option_as_slice)]
 #![allow(rustc::potential_query_instability)]
 #![recursion_limit = "256"]

compiler/rustc_metadata/src/lib.rs

@@ -1,6 +1,6 @@
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![feature(decl_macro)]
-#![feature(drain_filter)]
+#![feature(extract_if)]
 #![feature(generators)]
 #![feature(iter_from_generator)]
 #![feature(let_chains)]

compiler/rustc_metadata/src/native_libs.rs

@@ -425,7 +425,7 @@ impl<'tcx> Collector<'tcx> {
  // can move them to the end of the list below.
  let mut existing = self
  .libs
- .drain_filter(|lib| {
+ .extract_if(|lib| {
  if lib.name.as_str() == passed_lib.name {
  // FIXME: This whole logic is questionable, whether modifiers are
  // involved or not, library reordering and kind overriding without

compiler/rustc_middle/src/lib.rs

@@ -54,7 +54,7 @@
 #![feature(try_reserve_kind)]
 #![feature(nonzero_ops)]
 #![feature(decl_macro)]
-#![feature(drain_filter)]
+#![feature(extract_if)]
 #![feature(intra_doc_pointers)]
 #![feature(yeet_expr)]
 #![feature(result_option_inspect)]

compiler/rustc_middle/src/ty/diagnostics.rs

@@ -237,7 +237,7 @@ pub fn suggest_constraining_type_params<'a>(
 
  {
  let mut sized_constraints =
- constraints.drain_filter(|(_, def_id)| *def_id == tcx.lang_items().sized_trait());
+ constraints.extract_if(|(_, def_id)| *def_id == tcx.lang_items().sized_trait());
  if let Some((constraint, def_id)) = sized_constraints.next() {
  applicability = Applicability::MaybeIncorrect;
 

compiler/rustc_mir_transform/src/lib.rs

@@ -2,7 +2,6 @@
 #![deny(rustc::untranslatable_diagnostic)]
 #![deny(rustc::diagnostic_outside_of_impl)]
 #![feature(box_patterns)]
-#![feature(drain_filter)]
 #![feature(is_sorted)]
 #![feature(let_chains)]
 #![feature(map_try_insert)]

compiler/rustc_mir_transform/src/sroa.rs

@@ -436,26 +436,24 @@ impl<'tcx, 'll> MutVisitor<'tcx> for ReplacementVisitor<'tcx, 'll> {
  VarDebugInfoContents::Composite { ty: _, ref mut fragments } => {
  let mut new_fragments = Vec::new();
  debug!(?fragments);
- fragments
- .drain_filter(|fragment| {
- if let Some(repl) =
+ fragments.retain_mut(|fragment| {
+ if let Some(repl) =
  self.replacements.replace_place(self.tcx, fragment.contents.as_ref())
  {
  fragment.contents = repl;
- false
+ true
  } else if let Some(local) = fragment.contents.as_local()
  && let Some(frg) = self.gather_debug_info_fragments(local)
  {
  new_fragments.extend(frg.into_iter().map(|mut f| {
  f.projection.splice(0..0, fragment.projection.iter().copied());
  f
  }));
- true
- } else {
  false
+ } else {
+ true
  }
- })
- .for_each(drop);
+ });
  debug!(?fragments);
  debug!(?new_fragments);
  fragments.extend(new_fragments);

compiler/rustc_resolve/src/diagnostics.rs

@@ -2494,7 +2494,7 @@ fn show_candidates(
  for path_strings in [&mut accessible_path_strings, &mut inaccessible_path_strings] {
  path_strings.sort_by(|a, b| a.0.cmp(&b.0));
  let core_path_strings =
- path_strings.drain_filter(|p| p.0.starts_with("core::")).collect::<Vec<_>>();
+ path_strings.extract_if(|p| p.0.starts_with("core::")).collect::<Vec<_>>();
  path_strings.extend(core_path_strings);
  path_strings.dedup_by(|a, b| a.0 == b.0);
  }