diff --git a/kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs b/kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs index a2e52ac552c6..ac0236cdf1e0 100644 --- a/kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs +++ b/kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs @@ -18,7 +18,7 @@ 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, LayoutS, Primitive, Size, TagEncoding, + Abi::Vector, FieldIdx, FieldsShape, Float, Integer, LayoutData, Primitive, Size, TagEncoding, TyAndLayout, VariantIdx, Variants, }; use stable_mir::abi::{ArgAbi, FnAbi, PassMode}; @@ -675,7 +675,7 @@ impl<'tcx> GotocCtx<'tcx> { fn codegen_alignment_padding( &self, size: Size, - layout: &LayoutS, + layout: &LayoutData, idx: usize, ) -> Option { let align = Size::from_bits(layout.align.abi.bits()); @@ -700,7 +700,7 @@ impl<'tcx> GotocCtx<'tcx> { fn codegen_struct_fields( &mut self, flds: Vec<(String, Ty<'tcx>)>, - layout: &LayoutS, + layout: &LayoutData, initial_offset: Size, ) -> Vec { match &layout.fields { @@ -1112,7 +1112,7 @@ impl<'tcx> GotocCtx<'tcx> { &mut self, variant: &VariantDef, subst: &'tcx GenericArgsRef<'tcx>, - layout: &LayoutS, + layout: &LayoutData, initial_offset: Size, ) -> Vec { let flds: Vec<_> = @@ -1251,7 +1251,7 @@ impl<'tcx> GotocCtx<'tcx> { // https://github.com/rust-lang/rust/blob/e60ebb2f2c1facba87e7971798f3cbdfd309cd23/compiler/rustc_session/src/code_stats.rs#L166 let max_variant_size = variants .iter() - .map(|l: &LayoutS| l.size) + .map(|l: &LayoutData| l.size) .max() .unwrap(); let max_variant_size = std::cmp::max(max_variant_size, discr_offset); @@ -1298,7 +1298,7 @@ impl<'tcx> GotocCtx<'tcx> { ty: Ty<'tcx>, adtdef: &'tcx AdtDef, subst: &'tcx GenericArgsRef<'tcx>, - variants: &IndexVec>, + variants: &IndexVec>, ) -> Type { let non_zst_count = variants.iter().filter(|layout| layout.size.bytes() > 0).count(); let mangled_name = self.ty_mangled_name(ty); @@ -1317,7 +1317,7 @@ impl<'tcx> GotocCtx<'tcx> { pub(crate) fn variant_min_offset( &self, - variants: &IndexVec>, + variants: &IndexVec>, ) -> Option { variants .iter() @@ -1407,7 +1407,7 @@ impl<'tcx> GotocCtx<'tcx> { pretty_name: InternedString, def: &'tcx AdtDef, subst: &'tcx GenericArgsRef<'tcx>, - layouts: &IndexVec>, + layouts: &IndexVec>, initial_offset: Size, ) -> Vec { def.variants() @@ -1439,7 +1439,7 @@ impl<'tcx> GotocCtx<'tcx> { pretty_name: InternedString, case: &VariantDef, subst: &'tcx GenericArgsRef<'tcx>, - variant: &LayoutS, + variant: &LayoutData, initial_offset: Size, ) -> Type { let case_name = format!("{name}::{}", case.name); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 07e3926c6e4b..747ddbfbc549 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-28" +channel = "nightly-2024-10-29" components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]