Skip to content

Upgrade Rust toolchain to 2025-08-18 #4304

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 1 commit into from
Aug 18, 2025
Merged

Upgrade Rust toolchain to 2025-08-18 #4304

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
3 changes: 2 additions & 1 deletion kani-compiler/src/codegen_cprover_gotoc/overrides/hooks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use crate::unwrap_or_return_codegen_unimplemented_stmt;
use cbmc::goto_program::CIntType;
use cbmc::goto_program::Symbol as GotoSymbol;
use cbmc::goto_program::{BuiltinFn, Expr, Location, Stmt, Type};
use rustc_hir::LangItem;
use rustc_middle::ty::TyCtxt;
use rustc_public::mir::mono::Instance;
use rustc_public::mir::{BasicBlockIdx, Place};
Expand Down Expand Up @@ -332,7 +333,7 @@ impl GotocHook for Panic {
// panic functions we've stubbed too
kani_tool_attr.is_some_and(|kani| kani.contains("PanicStub"))
|| Some(def_id) == tcx.lang_items().panic_fn()
|| tcx.has_attr(def_id, rustc_span::sym::rustc_const_panic_str)
|| tcx.is_lang_item(def_id, LangItem::PanicDisplay)
|| Some(def_id) == tcx.lang_items().panic_fmt()
|| Some(def_id) == tcx.lang_items().begin_panic_fn()
}
Expand Down
3 changes: 2 additions & 1 deletion kani-compiler/src/kani_middle/transform/rustc_intrinsics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use crate::kani_middle::transform::body::{
};
use crate::kani_middle::transform::{TransformPass, TransformationType};
use crate::kani_queries::QueryDb;
use rustc_hir::LangItem;
use rustc_middle::ty::TyCtxt;
use rustc_public::mir::mono::Instance;
use rustc_public::mir::{
Expand Down Expand Up @@ -65,7 +66,7 @@ impl TransformPass for RustcIntrinsicsPass {
fn is_panic_function(tcx: &TyCtxt, def_id: rustc_public::DefId) -> bool {
let def_id = rustc_internal::internal(*tcx, def_id);
Some(def_id) == tcx.lang_items().panic_fn()
|| tcx.has_attr(def_id, rustc_span::sym::rustc_const_panic_str)
|| tcx.is_lang_item(def_id, LangItem::PanicDisplay)
|| Some(def_id) == tcx.lang_items().panic_fmt()
|| Some(def_id) == tcx.lang_items().begin_panic_fn()
}
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-08-16"
channel = "nightly-2025-08-18"
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]
Loading