Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Nov 27, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kani-compiler/src/kani_middle/resolve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion tests/expected/intrinsics/ctpop-ice/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/expected/intrinsics/simd-cmp-result-type-is-diff-size/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/expected/intrinsics/simd-extract-wrong-type/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/expected/intrinsics/simd-insert-wrong-type/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/expected/intrinsics/simd-result-type-is-float/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/expected/intrinsics/simd-shuffle-result-type-is-diff-size/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/expected/intrinsics/simd-shuffle-result-type-is-diff-type/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/expected/panic/arg-error/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/ui/should-panic-attribute/multiple-attrs/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/ui/should-panic-attribute/with-args/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/ui/solver-attribute/invalid/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ test.rs:\
|\
| #[kani::solver(123)]\
| ^^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error
error: aborting due to 1 previous error
2 changes: 1 addition & 1 deletion tests/ui/solver-attribute/multiple-args/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ test.rs:\
|\
| #[kani::solver(kissat, minisat)]\
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error
error: aborting due to 1 previous error
2 changes: 1 addition & 1 deletion tests/ui/solver-attribute/multiple-attrs/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ test.rs:\
|\
| #[kani::solver(kissat)]\
| ^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error
error: aborting due to 1 previous error
2 changes: 1 addition & 1 deletion tests/ui/solver-attribute/no-arg/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ test.rs:\
|\
| #[kani::solver]\
| ^^^^^^^^^^^^^^^
error: aborting due to previous error
error: aborting due to 1 previous error
2 changes: 1 addition & 1 deletion tests/ui/solver-attribute/unknown/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ test.rs:\
|\
| #[kani::solver(foo)]\
| ^^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error
error: aborting due to 1 previous error
Loading