Update to today's toolchain (sept-01) (model-checking#2726)

celinval · Sep 1, 2023 · 7831ad0 · 7831ad0
1 parent b119b0e
commit 7831ad0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/kani-compiler/src/codegen_cprover_gotoc/codegen/statement.rs b/kani-compiler/src/codegen_cprover_gotoc/codegen/statement.rs
@@ -123,7 +123,7 @@ impl<'tcx> GotocCtx<'tcx> {
                 loc,
                 "https://github.com/model-checking/kani/issues/692",
             ),
-            TerminatorKind::UnwindTerminate => self.codegen_mimic_unimplemented(
+            TerminatorKind::UnwindTerminate(_) => self.codegen_mimic_unimplemented(
                 "TerminatorKind::UnwindTerminate",
                 loc,
                 "https://github.com/model-checking/kani/issues/692",

diff --git a/kani-compiler/src/kani_middle/analysis.rs b/kani-compiler/src/kani_middle/analysis.rs
@@ -160,7 +160,7 @@ impl<'tcx> From<&Terminator<'tcx>> for Key {
             TerminatorKind::UnwindResume => Key("UnwindResume"),
             TerminatorKind::Return => Key("Return"),
             TerminatorKind::SwitchInt { .. } => Key("SwitchInt"),
-            TerminatorKind::UnwindTerminate => Key("UnwindTerminate"),
+            TerminatorKind::UnwindTerminate(_) => Key("UnwindTerminate"),
             TerminatorKind::Unreachable => Key("Unreachable"),
             TerminatorKind::Yield { .. } => Key("Yield"),
         }

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
 [toolchain]
-channel = "nightly-2023-08-25"
+channel = "nightly-2023-09-01"
 components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]
diff --git a/tools/build-kani/src/sysroot.rs b/tools/build-kani/src/sysroot.rs
@@ -192,12 +192,12 @@ fn is_std_lib(artifact: &Artifact) -> bool {
 /// predicate, it will copy the following files to the `target` folder.
 ///  - `rlib`: Store metadata for future codegen and executable code for concrete executions.
 ///  - shared library which are used for proc_macros.
-fn copy_libs<P>(artifacts: &[Artifact], target: &Path, predicate: P)
+fn copy_libs<P>(artifacts: &[Artifact], target: &Path, mut predicate: P)
 where
     P: FnMut(&Artifact) -> bool,
 {
     assert!(target.is_dir(), "Expected a folder, but found {}", target.display());
-    for artifact in artifacts.iter().cloned().filter(predicate) {
+    for artifact in artifacts.iter().filter(|&x| predicate(x)).cloned() {
         artifact
             .filenames
             .iter()