Skip to content

Upgrade rust toolchain to 2023-09-07 #2743

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

Merged
tautschnig merged 2 commits into from
Sep 8, 2023
Merged

Upgrade rust toolchain to 2023-09-07 #2743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff5d36c
Upgrade rust toolchain to 2023-09-07
tautschnig Sep 7, 2023
f5edcd3
Merge branch 'main' into toolchain-2023-09-07-manual
tautschnig Sep 8, 2023
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
12 changes: 0 additions & 12 deletions kani-compiler/src/codegen_cprover_gotoc/codegen/span.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,6 @@ impl<'tcx> GotocCtx<'tcx> {
self.current_fn().mir().var_debug_info.iter().find(|info| match info.value {
VarDebugInfoContents::Place(p) => p.local == *l && p.projection.len() == 0,
VarDebugInfoContents::Const(_) => false,
// This variant was added in
// https://github.com/rust-lang/rust/pull/102570 and is concerned
// with a scalar replacement of aggregates (SROA) MIR optimization
// that is only enabled with `--mir-opt-level=3` or higher.
// TODO: create a test and figure out if we should return debug info
// for this case:
// https://github.com/model-checking/kani/issues/1933
VarDebugInfoContents::Composite { .. } => {
// Fail in debug mode to determine if we ever hit this case
debug_assert!(false, "Unhandled VarDebugInfoContents::Composite");
false
}
})
}
}
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-09-06"
channel = "nightly-2023-09-07"
components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]