Merge remote-tracking branch 'upstream/master' into format-with-capacity

4 files changed, 32 insertions, 4 deletions

diff --git a/src/libcoretest/cell.rs b/src/libcoretest/cell.rs
index 724a312ea79..8585f2f0871 100644
--- a/src/libcoretest/cell.rs
+++ b/src/libcoretest/cell.rs
@@ -210,6 +210,37 @@ fn cell_default() {
 }
 
 #[test]
+fn cell_set() {
+    let cell = Cell::new(10);
+    cell.set(20);
+    assert_eq!(20, cell.get());
+
+    let cell = Cell::new("Hello".to_owned());
+    cell.set("World".to_owned());
+    assert_eq!("World".to_owned(), cell.into_inner());
+}
+
+#[test]
+fn cell_replace() {
+    let cell = Cell::new(10);
+    assert_eq!(10, cell.replace(20));
+    assert_eq!(20, cell.get());
+
+    let cell = Cell::new("Hello".to_owned());
+    assert_eq!("Hello".to_owned(), cell.replace("World".to_owned()));
+    assert_eq!("World".to_owned(), cell.into_inner());
+}
+
+#[test]
+fn cell_into_inner() {
+    let cell = Cell::new(10);
+    assert_eq!(10, cell.into_inner());
+
+    let cell = Cell::new("Hello world".to_owned());
+    assert_eq!("Hello world".to_owned(), cell.into_inner());
+}
+
+#[test]
 fn refcell_default() {
     let cell: RefCell<u64> = Default::default();
     assert_eq!(0, *cell.borrow());
diff --git a/src/libcoretest/hash/mod.rs b/src/libcoretest/hash/mod.rs
index 0d124338133..53ac17c052f 100644
--- a/src/libcoretest/hash/mod.rs
+++ b/src/libcoretest/hash/mod.rs
@@ -66,7 +66,6 @@ fn test_writer_hasher() {
     assert_eq!(hash(& s), 97 + 0xFF);
     let cs: &[u8] = &[1, 2, 3];
     assert_eq!(hash(& cs), 9);
-    // FIXME (#22405): Replace `Box::new` with `box` here when/if possible.
     let cs: Box<[u8]> = Box::new([1, 2, 3]);
     assert_eq!(hash(& cs), 9);
 
diff --git a/src/libcoretest/iter.rs b/src/libcoretest/iter.rs
index 99d31293053..6d02f76c33d 100644
--- a/src/libcoretest/iter.rs
+++ b/src/libcoretest/iter.rs
@@ -700,7 +700,6 @@ fn test_collect() {
 
 #[test]
 fn test_all() {
-    // FIXME (#22405): Replace `Box::new` with `box` here when/if possible.
     let v: Box<[isize]> = Box::new([1, 2, 3, 4, 5]);
     assert!(v.iter().all(|&x| x < 10));
     assert!(!v.iter().all(|&x| x % 2 == 0));
@@ -710,7 +709,6 @@ fn test_all() {
 
 #[test]
 fn test_any() {
-    // FIXME (#22405): Replace `Box::new` with `box` here when/if possible.
     let v: Box<[isize]> = Box::new([1, 2, 3, 4, 5]);
     assert!(v.iter().any(|&x| x < 10));
     assert!(v.iter().any(|&x| x % 2 == 0));
diff --git a/src/libcoretest/lib.rs b/src/libcoretest/lib.rs
index fed5b86c369..e06b757691e 100644
--- a/src/libcoretest/lib.rs
+++ b/src/libcoretest/lib.rs
@@ -32,8 +32,8 @@
 #![feature(unicode)]
 #![feature(unique)]
 #![feature(ordering_chaining)]
-#![feature(result_unwrap_or_default)]
 #![feature(ptr_unaligned)]
+#![feature(move_cell)]
 #![feature(fmt_internals)]
 
 extern crate core;