fix tests

Author: matklad

Cargo.lock.msrv

@@ -4,7 +4,7 @@ version = "1.21.0"
 authors = ["Aleksey Kladov <[email protected]>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.70"
 
 description = "Single assignment cells and lazy values."
 readme = "README.md"

Cargo.toml

@@ -130,7 +130,7 @@ fn once_bool_set() {
 #[test]
 fn get_unchecked() {
     let cell = OnceNonZeroUsize::new();
-    cell.set(NonZeroUsize::new(92).unwrap());
+    cell.set(NonZeroUsize::new(92).unwrap()).unwrap();
     let value = unsafe { cell.get_unchecked() };
     assert_eq!(value, NonZeroUsize::new(92).unwrap());
 }

tests/it/race.rs

@@ -154,7 +154,7 @@ fn onece_box_with_value() {
 fn onece_box_clone() {
     let cell1 = OnceBox::new();
     let cell2 = cell1.clone();
-    cell1.set(Box::new(92));
+    cell1.set(Box::new(92)).unwrap();
     let cell3 = cell1.clone();
     assert_eq!(cell1.get(), Some(&92));
     assert_eq!(cell2.get(), None);

tests/it/race_once_box.rs

@@ -5,8 +5,6 @@ use std::time::Instant;
 
 use xshell::{cmd, Shell};
 
-const MSRV: &str = "1.60.0";
-
 fn main() -> xshell::Result<()> {
     let sh = Shell::new()?;
 
@@ -53,14 +51,21 @@ fn main() -> xshell::Result<()> {
 
     {
         let _s = section("TEST_MSRV");
-        let _e = push_toolchain(&sh, MSRV)?;
+        let msrv = {
+            let manifest = sh.read_file("Cargo.toml")?;
+            let (_, suffix) = manifest.split_once("rust-version = \"").unwrap();
+            let (version, _) = suffix.split_once("\"").unwrap();
+            version.to_string()
+        };
+
+        let _e = push_toolchain(&sh, &msrv)?;
         sh.copy_file("Cargo.lock.msrv", "Cargo.lock")?;
         if let err @ Err(_) = cmd!(sh, "cargo update -w -v --locked").run() {
             // `Cargo.lock.msrv` is out of date! Probably from having bumped our own version number.
             println! {"\
                 Error: `Cargo.lock.msrv` is out of date. \
                 Please run:\n    \
-                (cp Cargo.lock{{.msrv,}} && cargo +{MSRV} update -w -v && cp Cargo.lock{{.msrv,}})\n\
+                (cp Cargo.lock{{.msrv,}} && cargo +{msrv} update -w -v && cp Cargo.lock{{.msrv,}})\n\
                 \n\
                 Alternatively, `git apply` the `.patch` below:\
             "}