Skip to content

Commit 77f9890

Browse files
authored
Upgrade toolchain to 2024-11-01 (#3671)
Changes required due to rust-lang/rust#132246 (Rename `rustc_abi::Abi` to `BackendRepr`). Resolves: #3669 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 f3e3f33 commit 77f9890

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ impl GotocCtx<'_> {
721721

722722
// For all intrinsics we first check `is_uninhabited` to give a more
723723
// precise error message
724-
if layout.abi.is_uninhabited() {
724+
if layout.backend_repr.is_uninhabited() {
725725
return self.codegen_fatal_error(
726726
PropertyClass::SafetyCheck,
727727
&format!(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ 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, LayoutData, Primitive, Size, TagEncoding,
22-
TyAndLayout, VariantIdx, Variants,
21+
BackendRepr::Vector, FieldIdx, FieldsShape, Float, Integer, LayoutData, Primitive, Size,
22+
TagEncoding, TyAndLayout, VariantIdx, Variants,
2323
};
2424
use stable_mir::abi::{ArgAbi, FnAbi, PassMode};
2525
use stable_mir::mir::Body;
@@ -1451,7 +1451,7 @@ impl<'tcx> GotocCtx<'tcx> {
14511451
}
14521452

14531453
fn codegen_vector(&mut self, ty: Ty<'tcx>) -> Type {
1454-
let layout = &self.layout_of(ty).layout.abi();
1454+
let layout = &self.layout_of(ty).layout.backend_repr();
14551455
debug! {"handling simd with layout {:?}", layout};
14561456

14571457
let (element, size) = match layout {

kani-driver/src/cbmc_output_parser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,9 +480,9 @@ impl Parser {
480480

481481
/// Read the process output and return when an item is found in the output
482482
/// or the EOF is reached
483-
async fn read_output<'a, 'b>(
483+
async fn read_output(
484484
&mut self,
485-
buffer: &'a mut BufReader<&'b mut ChildStdout>,
485+
buffer: &mut BufReader<&mut ChildStdout>,
486486
) -> Option<ParserItem> {
487487
loop {
488488
let mut input = String::new();

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

0 commit comments

Comments
 (0)