Skip to content

Commit 87cd331

Browse files
authored
Upgrade toolchain to 2024-10-29 (#3658)
Culprit PR identified by @tautschnig: rust-lang/rust#132252 Resolves #3657 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 52fcc6c commit 87cd331

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use rustc_middle::ty::{List, TypeFoldable};
1818
use rustc_smir::rustc_internal;
1919
use rustc_span::def_id::DefId;
2020
use rustc_target::abi::{
21-
Abi::Vector, FieldIdx, FieldsShape, Float, Integer, LayoutS, Primitive, Size, TagEncoding,
21+
Abi::Vector, FieldIdx, FieldsShape, Float, Integer, LayoutData, Primitive, Size, TagEncoding,
2222
TyAndLayout, VariantIdx, Variants,
2323
};
2424
use stable_mir::abi::{ArgAbi, FnAbi, PassMode};
@@ -675,7 +675,7 @@ impl<'tcx> GotocCtx<'tcx> {
675675
fn codegen_alignment_padding(
676676
&self,
677677
size: Size,
678-
layout: &LayoutS<FieldIdx, VariantIdx>,
678+
layout: &LayoutData<FieldIdx, VariantIdx>,
679679
idx: usize,
680680
) -> Option<DatatypeComponent> {
681681
let align = Size::from_bits(layout.align.abi.bits());
@@ -700,7 +700,7 @@ impl<'tcx> GotocCtx<'tcx> {
700700
fn codegen_struct_fields(
701701
&mut self,
702702
flds: Vec<(String, Ty<'tcx>)>,
703-
layout: &LayoutS<FieldIdx, VariantIdx>,
703+
layout: &LayoutData<FieldIdx, VariantIdx>,
704704
initial_offset: Size,
705705
) -> Vec<DatatypeComponent> {
706706
match &layout.fields {
@@ -1112,7 +1112,7 @@ impl<'tcx> GotocCtx<'tcx> {
11121112
&mut self,
11131113
variant: &VariantDef,
11141114
subst: &'tcx GenericArgsRef<'tcx>,
1115-
layout: &LayoutS<FieldIdx, VariantIdx>,
1115+
layout: &LayoutData<FieldIdx, VariantIdx>,
11161116
initial_offset: Size,
11171117
) -> Vec<DatatypeComponent> {
11181118
let flds: Vec<_> =
@@ -1251,7 +1251,7 @@ impl<'tcx> GotocCtx<'tcx> {
12511251
// https://github.com/rust-lang/rust/blob/e60ebb2f2c1facba87e7971798f3cbdfd309cd23/compiler/rustc_session/src/code_stats.rs#L166
12521252
let max_variant_size = variants
12531253
.iter()
1254-
.map(|l: &LayoutS<FieldIdx, VariantIdx>| l.size)
1254+
.map(|l: &LayoutData<FieldIdx, VariantIdx>| l.size)
12551255
.max()
12561256
.unwrap();
12571257
let max_variant_size = std::cmp::max(max_variant_size, discr_offset);
@@ -1298,7 +1298,7 @@ impl<'tcx> GotocCtx<'tcx> {
12981298
ty: Ty<'tcx>,
12991299
adtdef: &'tcx AdtDef,
13001300
subst: &'tcx GenericArgsRef<'tcx>,
1301-
variants: &IndexVec<VariantIdx, LayoutS<FieldIdx, VariantIdx>>,
1301+
variants: &IndexVec<VariantIdx, LayoutData<FieldIdx, VariantIdx>>,
13021302
) -> Type {
13031303
let non_zst_count = variants.iter().filter(|layout| layout.size.bytes() > 0).count();
13041304
let mangled_name = self.ty_mangled_name(ty);
@@ -1317,7 +1317,7 @@ impl<'tcx> GotocCtx<'tcx> {
13171317

13181318
pub(crate) fn variant_min_offset(
13191319
&self,
1320-
variants: &IndexVec<VariantIdx, LayoutS<FieldIdx, VariantIdx>>,
1320+
variants: &IndexVec<VariantIdx, LayoutData<FieldIdx, VariantIdx>>,
13211321
) -> Option<Size> {
13221322
variants
13231323
.iter()
@@ -1407,7 +1407,7 @@ impl<'tcx> GotocCtx<'tcx> {
14071407
pretty_name: InternedString,
14081408
def: &'tcx AdtDef,
14091409
subst: &'tcx GenericArgsRef<'tcx>,
1410-
layouts: &IndexVec<VariantIdx, LayoutS<FieldIdx, VariantIdx>>,
1410+
layouts: &IndexVec<VariantIdx, LayoutData<FieldIdx, VariantIdx>>,
14111411
initial_offset: Size,
14121412
) -> Vec<DatatypeComponent> {
14131413
def.variants()
@@ -1439,7 +1439,7 @@ impl<'tcx> GotocCtx<'tcx> {
14391439
pretty_name: InternedString,
14401440
case: &VariantDef,
14411441
subst: &'tcx GenericArgsRef<'tcx>,
1442-
variant: &LayoutS<FieldIdx, VariantIdx>,
1442+
variant: &LayoutData<FieldIdx, VariantIdx>,
14431443
initial_offset: Size,
14441444
) -> Type {
14451445
let case_name = format!("{name}::{}", case.name);

rust-toolchain.toml

+1-1
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-10-28"
5+
channel = "nightly-2024-10-29"
66
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]

0 commit comments

Comments
 (0)