Update the rust toolchain to nightly-2023-11-27 (#2897)

Changes required due to: - rust-lang/rust#118256 - rust-lang/rust#118138
model-checking · Nov 27, 2023 · d5e9a1c · d5e9a1c
1 parent 071dc41
commit d5e9a1c
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 18 deletions.
diff --git a/kani-compiler/src/kani_middle/resolve.rs b/kani-compiler/src/kani_middle/resolve.rs
@@ -190,7 +190,7 @@ fn resolve_prefix<'tcx>(
         CRATE => {
             segments.next();
             // Find the module at the root of the crate.
-            let current_module_hir_id = tcx.hir().local_def_id_to_hir_id(current_module);
+            let current_module_hir_id = tcx.local_def_id_to_hir_id(current_module);
             let crate_root = match tcx.hir().parent_iter(current_module_hir_id).last() {
                 None => current_module,
                 Some((hir_id, _)) => hir_id.owner.def_id,
@@ -229,7 +229,7 @@ fn resolve_super<'tcx, I>(
 where
     I: Iterator<Item = String>,
 {
-    let current_module_hir_id = tcx.hir().local_def_id_to_hir_id(current_module);
+    let current_module_hir_id = tcx.local_def_id_to_hir_id(current_module);
     let mut parents = tcx.hir().parent_iter(current_module_hir_id);
     let mut base_module = current_module;
     while segments.next_if(|segment| segment == SUPER).is_some() {

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-11-22"
+channel = "nightly-2023-11-27"
 components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]
diff --git a/tests/expected/intrinsics/ctpop-ice/expected b/tests/expected/intrinsics/ctpop-ice/expected
@@ -3,4 +3,4 @@ error: Type check failed for intrinsic `ctpop`: Expected integer type, found ()
 12 |     let n = ctpop(());
    |             ^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/expected/intrinsics/simd-cmp-result-type-is-diff-size/expected b/tests/expected/intrinsics/simd-cmp-result-type-is-diff-size/expected
@@ -1,2 +1,2 @@
 expected return type with length 2 (same as input type `u64x2`), found `u32x4` with length 4
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/expected/intrinsics/simd-extract-wrong-type/expected b/tests/expected/intrinsics/simd-extract-wrong-type/expected
@@ -1,2 +1,2 @@
 expected return type `i64` (element of input `i64x2`), found `i32`
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/expected/intrinsics/simd-insert-wrong-type/expected b/tests/expected/intrinsics/simd-insert-wrong-type/expected
@@ -1,2 +1,2 @@
 expected inserted type `i64` (element of input `i64x2`), found `i32`
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/expected/intrinsics/simd-result-type-is-float/expected b/tests/expected/intrinsics/simd-result-type-is-float/expected
@@ -1,2 +1,2 @@
 expected return type with integer elements, found `f32x2` with non-integer `f32`
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/expected/intrinsics/simd-shuffle-result-type-is-diff-size/expected b/tests/expected/intrinsics/simd-shuffle-result-type-is-diff-size/expected
@@ -1,2 +1,2 @@
 expected return type of length 4, found `i64x2` with length 2
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/expected/intrinsics/simd-shuffle-result-type-is-diff-type/expected b/tests/expected/intrinsics/simd-shuffle-result-type-is-diff-type/expected
@@ -1,2 +1,2 @@
 expected return element type `i64` (element of input `i64x2`), found `f64x2` with element type `f64`
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/expected/panic/arg-error/expected b/tests/expected/panic/arg-error/expected
@@ -1,2 +1,2 @@
 error: 1 positional argument in format string, but no arguments were given
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/ui/should-panic-attribute/multiple-attrs/expected b/tests/ui/should-panic-attribute/multiple-attrs/expected
@@ -1,2 +1,2 @@
 error: only one '#[kani::should_panic]' attribute is allowed per harness
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/ui/should-panic-attribute/with-args/expected b/tests/ui/should-panic-attribute/with-args/expected
@@ -1,3 +1,3 @@
 error: custom attribute panicked
 help: message: `#[kani::should_panic]` does not take any arguments currently
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/ui/solver-attribute/invalid/expected b/tests/ui/solver-attribute/invalid/expected
@@ -3,4 +3,4 @@ test.rs:\
 |\
 | #[kani::solver(123)]\
 | ^^^^^^^^^^^^^^^^^^^^
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/ui/solver-attribute/multiple-args/expected b/tests/ui/solver-attribute/multiple-args/expected
@@ -3,4 +3,4 @@ test.rs:\
 |\
 | #[kani::solver(kissat, minisat)]\
 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/ui/solver-attribute/multiple-attrs/expected b/tests/ui/solver-attribute/multiple-attrs/expected
@@ -3,4 +3,4 @@ test.rs:\
 |\
 | #[kani::solver(kissat)]\
 | ^^^^^^^^^^^^^^^^^^^^^^^
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/ui/solver-attribute/no-arg/expected b/tests/ui/solver-attribute/no-arg/expected
@@ -3,4 +3,4 @@ test.rs:\
 |\
 | #[kani::solver]\
 | ^^^^^^^^^^^^^^^
-error: aborting due to previous error
+error: aborting due to 1 previous error
diff --git a/tests/ui/solver-attribute/unknown/expected b/tests/ui/solver-attribute/unknown/expected
@@ -3,4 +3,4 @@ test.rs:\
 |\
 | #[kani::solver(foo)]\
 | ^^^^^^^^^^^^^^^^^^^^
-error: aborting due to previous error
+error: aborting due to 1 previous error