From 071dc41ab3da91cc72b15f26c95bbb1670e1e8ba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 17:36:34 +0100 Subject: [PATCH 1/3] Automatic toolchain upgrade to nightly-2023-11-22 (#2893) Update Rust toolchain from nightly-2023-11-21 to nightly-2023-11-22 without any other source changes. This is an automatically generated pull request. If any of the CI checks fail, manual intervention is required. In such a case, review the changes at https://github.com/rust-lang/rust from https://github.com/rust-lang/rust/commit/3a85a5cfe7884f94e3cb29a606913d7989ad9b48 up to https://github.com/rust-lang/rust/commit/2f8d81f9dbac6b8df982199f69da04a4c8357227. --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e3af7b80e8f6..c759e2625603 100644 --- 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-21" +channel = "nightly-2023-11-22" components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"] From d5e9a1c15baf8fdb95515c8747aec8776d99aa39 Mon Sep 17 00:00:00 2001 From: "Celina G. Val" Date: Mon, 27 Nov 2023 13:23:09 -0800 Subject: [PATCH 2/3] Update the rust toolchain to nightly-2023-11-27 (#2897) Changes required due to: - https://github.com/rust-lang/rust/pull/118256 - https://github.com/rust-lang/rust/pull/118138 --- kani-compiler/src/kani_middle/resolve.rs | 4 ++-- rust-toolchain.toml | 2 +- tests/expected/intrinsics/ctpop-ice/expected | 2 +- .../intrinsics/simd-cmp-result-type-is-diff-size/expected | 2 +- tests/expected/intrinsics/simd-extract-wrong-type/expected | 2 +- tests/expected/intrinsics/simd-insert-wrong-type/expected | 2 +- tests/expected/intrinsics/simd-result-type-is-float/expected | 2 +- .../intrinsics/simd-shuffle-result-type-is-diff-size/expected | 2 +- .../intrinsics/simd-shuffle-result-type-is-diff-type/expected | 2 +- tests/expected/panic/arg-error/expected | 2 +- tests/ui/should-panic-attribute/multiple-attrs/expected | 2 +- tests/ui/should-panic-attribute/with-args/expected | 2 +- tests/ui/solver-attribute/invalid/expected | 2 +- tests/ui/solver-attribute/multiple-args/expected | 2 +- tests/ui/solver-attribute/multiple-attrs/expected | 2 +- tests/ui/solver-attribute/no-arg/expected | 2 +- tests/ui/solver-attribute/unknown/expected | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/kani-compiler/src/kani_middle/resolve.rs b/kani-compiler/src/kani_middle/resolve.rs index 0cc3ee0b7f3a..1d3b1a2c2f06 100644 --- 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, { - 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 index c759e2625603..3957d9e04ee1 100644 --- 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 index 25fbb79d9551..1ac989525f36 100644 --- 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 \ No newline at end of file +error: aborting due to 1 previous error \ No newline at end of file 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 index f6bf97116db3..b535e4699346 100644 --- 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 \ No newline at end of file +error: aborting due to 1 previous error \ No newline at end of file diff --git a/tests/expected/intrinsics/simd-extract-wrong-type/expected b/tests/expected/intrinsics/simd-extract-wrong-type/expected index 5d6a42b0542d..eb2c6e932803 100644 --- 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 \ No newline at end of file +error: aborting due to 1 previous error \ No newline at end of file diff --git a/tests/expected/intrinsics/simd-insert-wrong-type/expected b/tests/expected/intrinsics/simd-insert-wrong-type/expected index 8e2271a5ca57..c86b42bc89e4 100644 --- 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 \ No newline at end of file +error: aborting due to 1 previous error \ No newline at end of file diff --git a/tests/expected/intrinsics/simd-result-type-is-float/expected b/tests/expected/intrinsics/simd-result-type-is-float/expected index 26145ffed72c..991b6f37d384 100644 --- 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 \ No newline at end of file +error: aborting due to 1 previous error \ No newline at end of file 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 index bc85467ee413..6b6c4ad781fd 100644 --- 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 \ No newline at end of file +error: aborting due to 1 previous error \ No newline at end of file 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 index 4bb75c754afb..9982de236965 100644 --- 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 \ No newline at end of file +error: aborting due to 1 previous error \ No newline at end of file diff --git a/tests/expected/panic/arg-error/expected b/tests/expected/panic/arg-error/expected index 95567d5f7efb..655a016bc38e 100644 --- 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 index 5dd8c6a61430..ecc7c6fc91c8 100644 --- 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 index 3ba218b82a69..2ab549629004 100644 --- 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 index 53f6b87bf547..fe4f1da36d68 100644 --- 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 index 64e1a5468fc3..9bd942eaafa3 100644 --- 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 index 1287dedaaab1..5a6b5cb298b1 100644 --- 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 index 42cadb93b477..c4946d27dafd 100644 --- 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 index 7d3bf6d61ef3..7825d4e8c93c 100644 --- 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 From 4787efed376b81d068385cabb43fa3dd886758a5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 11:00:36 +0100 Subject: [PATCH 3/3] Automatic toolchain upgrade to nightly-2023-11-28 (#2898) Update Rust toolchain from nightly-2023-11-27 to nightly-2023-11-28 without any other source changes. This is an automatically generated pull request. If any of the CI checks fail, manual intervention is required. In such a case, review the changes at https://github.com/rust-lang/rust from https://github.com/rust-lang/rust/commit/6cf088810f66fff15d05bf7135c5f5888b7c93b4 up to https://github.com/rust-lang/rust/commit/49b3924bd4a34d3cf9c37b74120fba78d9712ab8. --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3957d9e04ee1..426db70f76d4 100644 --- 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-27" +channel = "nightly-2023-11-28" components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]