Auto merge of #2928 - oli-obk:rustup, r=oli-obk

Rustup

Author: bors

rust-version

@@ -1 +1 @@
-37998ab508d5d9fa0d465d7b535dc673087dda8f
+314c39d2ea07d8b50649149358ebeb1a6bd09179

tests/pass/btreemap.rs

@@ -1,7 +1,7 @@
 //@revisions: stack tree
 //@[tree]compile-flags: -Zmiri-tree-borrows
 //@compile-flags: -Zmiri-strict-provenance
-#![feature(btree_drain_filter)]
+#![feature(btree_extract_if)]
 use std::collections::{BTreeMap, BTreeSet};
 use std::mem;
 
@@ -49,8 +49,8 @@ pub fn main() {
     }
     test_all_refs(&mut 13, b.values_mut());
 
-    // Test forgetting the drain.
-    let mut d = b.drain_filter(|_, i| *i < 30);
+    // Test forgetting the extractor.
+    let mut d = b.extract_if(|_, i| *i < 30);
     d.next().unwrap();
     mem::forget(d);
 }