Upgrade toolchain to 2/10

- Remove rustc_target::abi, c.f. rust-lang/rust@1f37b9a

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

@@ -12,9 +12,9 @@ use crate::codegen_cprover_gotoc::codegen::typ::std_pointee_type;
 use crate::codegen_cprover_gotoc::utils::{dynamic_fat_ptr, slice_fat_ptr};
 use crate::unwrap_or_return_codegen_unimplemented;
 use cbmc::goto_program::{Expr, ExprValue, Location, Stmt, Type};
+use rustc_abi::{TagEncoding, Variants};
 use rustc_middle::ty::layout::LayoutOf;
 use rustc_smir::rustc_internal;
-use rustc_target::abi::{TagEncoding, Variants};
 use stable_mir::mir::{FieldIdx, Local, Mutability, Place, ProjectionElem};
 use stable_mir::ty::{RigidTy, Ty, TyKind, VariantDef, VariantIdx};
 use tracing::{debug, trace, warn};

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

@@ -18,9 +18,9 @@ use cbmc::goto_program::{
 };
 use cbmc::{InternString, InternedString, btree_string_map};
 use num::bigint::BigInt;
+use rustc_abi::{FieldsShape, TagEncoding, Variants};
 use rustc_middle::ty::{TyCtxt, TypingEnv, VtblEntry};
 use rustc_smir::rustc_internal;
-use rustc_target::abi::{FieldsShape, TagEncoding, Variants};
 use stable_mir::abi::{Primitive, Scalar, ValueAbi};
 use stable_mir::mir::mono::Instance;
 use stable_mir::mir::{

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

@@ -7,10 +7,10 @@ use crate::codegen_cprover_gotoc::codegen::function::rustc_smir::region_from_cov
 use crate::codegen_cprover_gotoc::{GotocCtx, VtableCtx};
 use crate::unwrap_or_return_codegen_unimplemented_stmt;
 use cbmc::goto_program::{Expr, Location, Stmt, Type};
+use rustc_abi::{FieldsShape, Primitive, TagEncoding, Variants};
 use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::{List, TypingEnv};
 use rustc_smir::rustc_internal;
-use rustc_target::abi::{FieldsShape, Primitive, TagEncoding, Variants};
 use stable_mir::abi::{ArgAbi, FnAbi, PassMode};
 use stable_mir::mir::mono::{Instance, InstanceKind};
 use stable_mir::mir::{

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

@@ -4,6 +4,10 @@ use crate::codegen_cprover_gotoc::GotocCtx;
 use cbmc::goto_program::{DatatypeComponent, Expr, Location, Parameter, Symbol, SymbolTable, Type};
 use cbmc::utils::aggr_tag;
 use cbmc::{InternString, InternedString};
+use rustc_abi::{
+    BackendRepr::Vector, FieldIdx, FieldsShape, Float, Integer, LayoutData, Primitive, Size,
+    TagEncoding, TyAndLayout, VariantIdx, Variants,
+};
 use rustc_ast::ast::Mutability;
 use rustc_index::IndexVec;
 use rustc_middle::ty::GenericArgsRef;
@@ -17,10 +21,6 @@ use rustc_middle::ty::{
 use rustc_middle::ty::{List, TypeFoldable};
 use rustc_smir::rustc_internal;
 use rustc_span::def_id::DefId;
-use rustc_target::abi::{
-    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;
 use stable_mir::mir::mono::Instance as InstanceStable;

kani-compiler/src/codegen_cprover_gotoc/compiler_interface.rs

@@ -23,6 +23,7 @@ use cbmc::{InternedString, MachineModel};
 use kani_metadata::artifact::convert_type;
 use kani_metadata::{ArtifactType, HarnessMetadata, KaniMetadata, UnsupportedFeature};
 use kani_metadata::{AssignsContract, CompilerArtifactStub};
+use rustc_abi::Endian;
 use rustc_codegen_ssa::back::archive::{
     ArArchiveBuilder, ArchiveBuilder, ArchiveBuilderBuilder, DEFAULT_OBJECT_READER,
 };
@@ -40,7 +41,6 @@ use rustc_session::Session;
 use rustc_session::config::{CrateType, OutputFilenames, OutputType};
 use rustc_session::output::out_filename;
 use rustc_smir::rustc_internal;
-use rustc_target::abi::Endian;
 use rustc_target::spec::PanicStrategy;
 use stable_mir::mir::mono::{Instance, MonoItem};
 use stable_mir::{CrateDef, DefId};

kani-compiler/src/codegen_cprover_gotoc/context/goto_ctx.rs

@@ -26,6 +26,7 @@ use cbmc::goto_program::{
 };
 use cbmc::utils::aggr_tag;
 use cbmc::{InternedString, MachineModel};
+use rustc_abi::{HasDataLayout, TargetDataLayout};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_middle::span_bug;
 use rustc_middle::ty::layout::{
@@ -35,8 +36,7 @@ use rustc_middle::ty::layout::{
 use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_span::Span;
 use rustc_span::source_map::respan;
-use rustc_target::abi::call::FnAbi;
-use rustc_target::abi::{HasDataLayout, TargetDataLayout};
+use rustc_target::callconv::FnAbi;
 use stable_mir::mir::Body;
 use stable_mir::mir::mono::Instance;
 use stable_mir::ty::Allocation;

kani-compiler/src/kani_middle/transform/internal_mir.rs

@@ -42,7 +42,7 @@ impl RustcInternalMir for AggregateKind {
                 internal(tcx, generic_args),
                 maybe_user_type_annotation_index
                     .map(rustc_middle::ty::UserTypeAnnotationIndex::from_usize),
-                maybe_field_idx.map(rustc_target::abi::FieldIdx::from_usize),
+                maybe_field_idx.map(rustc_abi::FieldIdx::from_usize),
             ),
             AggregateKind::Closure(closure_def, generic_args) => {
                 rustc_middle::mir::AggregateKind::Closure(
@@ -207,7 +207,7 @@ impl RustcInternalMir for NullOp {
                         .map(|(variant_idx, field_idx)| {
                             (
                                 internal(tcx, variant_idx),
-                                rustc_target::abi::FieldIdx::from_usize(*field_idx),
+                                rustc_abi::FieldIdx::from_usize(*field_idx),
                             )
                         })
                         .collect::<Vec<_>>()

rust-toolchain.toml

@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
 [toolchain]
-channel = "nightly-2025-02-08"
+channel = "nightly-2025-02-10"
 components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]