diff --git a/kani-compiler/src/codegen_cprover_gotoc/codegen/intrinsic.rs b/kani-compiler/src/codegen_cprover_gotoc/codegen/intrinsic.rs index e8f566dafb15..933ad4ec3a4c 100644 --- a/kani-compiler/src/codegen_cprover_gotoc/codegen/intrinsic.rs +++ b/kani-compiler/src/codegen_cprover_gotoc/codegen/intrinsic.rs @@ -721,7 +721,7 @@ impl GotocCtx<'_> { // For all intrinsics we first check `is_uninhabited` to give a more // precise error message - if layout.abi.is_uninhabited() { + if layout.backend_repr.is_uninhabited() { return self.codegen_fatal_error( PropertyClass::SafetyCheck, &format!( diff --git a/kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs b/kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs index ac0236cdf1e0..7181ce36f18e 100644 --- a/kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs +++ b/kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs @@ -18,8 +18,8 @@ use rustc_middle::ty::{List, TypeFoldable}; use rustc_smir::rustc_internal; use rustc_span::def_id::DefId; use rustc_target::abi::{ - Abi::Vector, FieldIdx, FieldsShape, Float, Integer, LayoutData, Primitive, Size, TagEncoding, - TyAndLayout, VariantIdx, Variants, + BackendRepr::Vector, FieldIdx, FieldsShape, Float, Integer, LayoutData, Primitive, Size, + TagEncoding, TyAndLayout, VariantIdx, Variants, }; use stable_mir::abi::{ArgAbi, FnAbi, PassMode}; use stable_mir::mir::Body; @@ -1451,7 +1451,7 @@ impl<'tcx> GotocCtx<'tcx> { } fn codegen_vector(&mut self, ty: Ty<'tcx>) -> Type { - let layout = &self.layout_of(ty).layout.abi(); + let layout = &self.layout_of(ty).layout.backend_repr(); debug! {"handling simd with layout {:?}", layout}; let (element, size) = match layout { diff --git a/kani-driver/src/cbmc_output_parser.rs b/kani-driver/src/cbmc_output_parser.rs index a34f6815e3dd..bf86ef08c217 100644 --- a/kani-driver/src/cbmc_output_parser.rs +++ b/kani-driver/src/cbmc_output_parser.rs @@ -480,9 +480,9 @@ impl Parser { /// Read the process output and return when an item is found in the output /// or the EOF is reached - async fn read_output<'a, 'b>( + async fn read_output( &mut self, - buffer: &'a mut BufReader<&'b mut ChildStdout>, + buffer: &mut BufReader<&mut ChildStdout>, ) -> Option { loop { let mut input = String::new(); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 331ac6d6e1db..4512c986be07 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,5 +2,5 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT [toolchain] -channel = "nightly-2024-10-31" +channel = "nightly-2024-11-01" components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]