Skip to content

Commit

Permalink
Upgrade toolchain to 2024-11-01 (#3671)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
tautschnig authored Nov 1, 2024
1 parent f3e3f33 commit 77f9890
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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!(
Expand Down
6 changes: 3 additions & 3 deletions kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions kani-driver/src/cbmc_output_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<ParserItem> {
loop {
let mut input = String::new();
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

0 comments on commit 77f9890

Please sign in to comment.