Skip to content

Commit ac823d3

Browse files
authored
Upgrade toolchain to 2024-07-18 (rust-lang#3355)
Resolves rust-lang#3353 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.
1 parent f51149c commit ac823d3

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

kani-compiler/src/codegen_cprover_gotoc/compiler_interface.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ use kani_metadata::artifact::convert_type;
2424
use kani_metadata::UnsupportedFeature;
2525
use kani_metadata::{ArtifactType, HarnessMetadata, KaniMetadata};
2626
use kani_metadata::{AssignsContract, CompilerArtifactStub};
27-
use rustc_codegen_ssa::back::archive::{
28-
get_native_object_symbols, ArArchiveBuilder, ArchiveBuilder,
29-
};
27+
use rustc_codegen_ssa::back::archive::{ArArchiveBuilder, ArchiveBuilder, DEFAULT_OBJECT_READER};
3028
use rustc_codegen_ssa::back::metadata::create_wrapper_file;
3129
use rustc_codegen_ssa::traits::CodegenBackend;
3230
use rustc_codegen_ssa::{CodegenResults, CrateInfo};
@@ -402,7 +400,7 @@ impl CodegenBackend for GotocCodegenBackend {
402400
debug!(?crate_type, ?out_path, "link");
403401
if *crate_type == CrateType::Rlib {
404402
// Emit the `rlib` that contains just one file: `<crate>.rmeta`
405-
let mut builder = Box::new(ArArchiveBuilder::new(sess, get_native_object_symbols));
403+
let mut builder = Box::new(ArArchiveBuilder::new(sess, &DEFAULT_OBJECT_READER));
406404
let tmp_dir = TempFileBuilder::new().prefix("kani").tempdir().unwrap();
407405
let path = MaybeTempDir::new(tmp_dir, sess.opts.cg.save_temps);
408406
let (metadata, _metadata_position) = create_wrapper_file(

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# SPDX-License-Identifier: Apache-2.0 OR MIT
33

44
[toolchain]
5-
channel = "nightly-2024-07-17"
5+
channel = "nightly-2024-07-18"
66
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]

0 commit comments

Comments
 (0)