Skip to content

Upgrade toolchain to nightly-2025-03-07 #3931

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
merged 3 commits into from
Mar 11, 2025
Merged

Upgrade toolchain to nightly-2025-03-07 #3931

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
092dfb7
Upgrade toolchain to nightly-2025-03-07
tautschnig Mar 11, 2025
9fd0fca
Fix scanner
tautschnig Mar 11, 2025
830997f
Remove test of non-existent feature
tautschnig Mar 11, 2025
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
2 changes: 1 addition & 1 deletion kani-compiler/src/kani_middle/stubbing/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ pub fn validate_stub_const(tcx: TyCtxt, instance: Instance) -> bool {
let item = CrateItem::try_from(instance).unwrap();
let internal_instance = rustc_internal::internal(tcx, instance);
let mut checker = StubConstChecker::new(tcx, internal_instance, item);
checker.visit_body(&item.body());
checker.visit_body(&item.expect_body());
checker.is_valid()
}

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-2025-03-05"
channel = "nightly-2025-03-07"
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]
10 changes: 5 additions & 5 deletions tools/scanner/src/analysis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ impl OverallStats {
if !kind.is_fn() {
return None;
};
let unsafe_ops = FnUnsafeOperations::new(item.name()).collect(&item.body());
let unsafe_ops = FnUnsafeOperations::new(item.name()).collect(&item.expect_body());
let fn_sig = kind.fn_sig().unwrap();
let is_unsafe = fn_sig.skip_binder().safety == Safety::Unsafe;
self.fn_stats.get_mut(&item).unwrap().has_unsafe_ops =
Expand Down Expand Up @@ -167,7 +167,7 @@ impl OverallStats {
if !kind.is_fn() {
return None;
};
Some(FnLoops::new(item.name()).collect(&item.body()))
Some(FnLoops::new(item.name()).collect(&item.expect_body()))
})
.partition::<Vec<_>, _>(|props| props.has_loops());

Expand All @@ -179,7 +179,7 @@ impl OverallStats {
if !kind.is_fn() {
return None;
};
Some(FnLoops::new(item.name()).collect(&item.body()))
Some(FnLoops::new(item.name()).collect(&item.expect_body()))
})
.partition::<Vec<_>, _>(|props| props.has_iterators());

Expand All @@ -190,7 +190,7 @@ impl OverallStats {
if !kind.is_fn() {
return None;
};
let fn_props = FnLoops::new(item.name()).collect(&item.body());
let fn_props = FnLoops::new(item.name()).collect(&item.expect_body());
self.fn_stats.get_mut(&item).unwrap().has_loop_or_iterator =
Some(fn_props.has_iterators() || fn_props.has_loops());
Some(fn_props)
Expand Down Expand Up @@ -601,7 +601,7 @@ impl Recursion {
.into_iter()
.filter_map(|item| {
if let TyKind::RigidTy(RigidTy::FnDef(def, _)) = item.ty().kind() {
let body = item.body();
let body = item.expect_body();
let mut visitor = FnCallVisitor { body: &body, fns: vec![] };
visitor.visit_body(&body);
Some((def, visitor.fns))
Expand Down
Loading