Update toolchain to 2/7

  - Implement internal for RawPtrKind, c.f. rust-lang/rust#136590
  - Replace Lrc with Arc, c.f. rust-lang/rust#136471

Author: carolynzech

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

@@ -13,8 +13,8 @@ use rustc_smir::rustc_internal::internal;
 use stable_mir::mir::{
     AggregateKind, AssertMessage, Body, BorrowKind, CastKind, ConstOperand, CopyNonOverlapping,
     CoroutineDesugaring, CoroutineKind, CoroutineSource, FakeBorrowKind, FakeReadCause, LocalDecl,
-    MutBorrowKind, NonDivergingIntrinsic, NullOp, Operand, PointerCoercion, RawPtrKind, RetagKind,
-    Rvalue, Statement, StatementKind, SwitchTargets, Terminator, TerminatorKind, UnwindAction,
+    MutBorrowKind, NonDivergingIntrinsic, NullOp, Operand, PointerCoercion, RetagKind, Rvalue,
+    Statement, StatementKind, SwitchTargets, Terminator, TerminatorKind, UnwindAction,
     UserTypeProjection, Variance,
 };
 
@@ -225,10 +225,9 @@ impl RustcInternalMir for Rvalue {
 
     fn internal_mir<'tcx>(&self, tcx: TyCtxt<'tcx>) -> Self::T<'tcx> {
         match self {
-            Rvalue::AddressOf(raw_ptr_kind, place) => rustc_middle::mir::Rvalue::RawPtr(
-                raw_ptr_kind.internal_mir(tcx),
-                internal(tcx, place),
-            ),
+            Rvalue::AddressOf(raw_ptr_kind, place) => {
+                rustc_middle::mir::Rvalue::RawPtr(internal(tcx, raw_ptr_kind), internal(tcx, place))
+            }
             Rvalue::Aggregate(aggregate_kind, operands) => rustc_middle::mir::Rvalue::Aggregate(
                 Box::new(aggregate_kind.internal_mir(tcx)),
                 rustc_index::IndexVec::from_raw(
@@ -284,18 +283,6 @@ impl RustcInternalMir for Rvalue {
     }
 }
 
-impl RustcInternalMir for RawPtrKind {
-    type T<'tcx> = rustc_middle::mir::RawPtrKind;
-
-    fn internal_mir<'tcx>(&self, _tcx: TyCtxt<'tcx>) -> Self::T<'tcx> {
-        match self {
-            RawPtrKind::Mut => rustc_middle::mir::RawPtrKind::Mut,
-            RawPtrKind::Const => rustc_middle::mir::RawPtrKind::Const,
-            RawPtrKind::FakeForPtrMetadata => rustc_middle::mir::RawPtrKind::FakeForPtrMetadata,
-        }
-    }
-}
-
 impl RustcInternalMir for FakeReadCause {
     type T<'tcx> = rustc_middle::mir::FakeReadCause;
 

kani-compiler/src/session.rs

@@ -4,7 +4,6 @@
 //! Module used to configure a compiler session.
 
 use crate::args::Arguments;
-use rustc_data_structures::sync::Lrc;
 use rustc_errors::{
     ColorConfig, DiagInner, emitter::Emitter, emitter::HumanReadableErrorType,
     fallback_fluent_bundle, json::JsonEmitter, registry::Registry as ErrorRegistry,
@@ -16,6 +15,7 @@ use rustc_span::source_map::SourceMap;
 use std::io;
 use std::io::IsTerminal;
 use std::panic;
+use std::sync::Arc;
 use std::sync::LazyLock;
 use tracing_subscriber::{EnvFilter, Registry, layer::SubscriberExt};
 use tracing_tree::HierarchicalLayer;
@@ -57,7 +57,7 @@ static JSON_PANIC_HOOK: LazyLock<Box<dyn Fn(&panic::PanicHookInfo<'_>) + Sync +
             let mut emitter = JsonEmitter::new(
                 Box::new(io::BufWriter::new(io::stderr())),
                 #[allow(clippy::arc_with_non_send_sync)]
-                Some(Lrc::new(SourceMap::new(FilePathMapping::empty()))),
+                Some(Arc::new(SourceMap::new(FilePathMapping::empty()))),
                 fallback_bundle,
                 false,
                 HumanReadableErrorType::Default,

rust-toolchain.toml

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