Update rustc again

Author: Nadrieril

engine/lib/import_thir.ml

@@ -1101,8 +1101,6 @@ end) : EXPR = struct
         match non_traits with
         | [] -> TDyn { witness = W.dyn; goals }
         | _ -> assertion_failure [ span ] "type Dyn with non trait predicate")
-    | Dynamic (_, _, DynStar) ->
-        unimplemented ~issue_id:931 [ span ] "type DynStar"
     | Coroutine _ ->
         unimplemented ~issue_id:924 [ span ]
           "Got type `Coroutine`: coroutines are not supported by hax"

flake.lock

@@ -1,10 +1,10 @@
 [package]
 name = "hax-frontend-exporter"
+edition = "2024"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
 homepage.workspace = true
-edition.workspace = true
 repository.workspace = true
 readme.workspace = true
 description = "Provides mirrors of the algebraic data types used in the Rust compilers, removing indirections and inlining various pieces of information."

frontend/exporter/Cargo.toml

@@ -1,6 +1,5 @@
 #![allow(rustdoc::private_intra_doc_links)]
 #![cfg_attr(feature = "rustc", feature(if_let_guard))]
-#![cfg_attr(feature = "rustc", feature(let_chains))]
 #![cfg_attr(feature = "rustc", feature(macro_metavar_expr))]
 #![cfg_attr(feature = "rustc", feature(rustc_private))]
 #![cfg_attr(feature = "rustc", feature(sized_hierarchy))]

frontend/exporter/src/lib.rs

@@ -21,6 +21,8 @@ use crate::{AdtInto, JsonSchema};
 use {rustc_hir as hir, rustc_hir::def_id::DefId as RDefId, rustc_middle::ty};
 
 pub type Symbol = String;
+#[cfg(not(feature = "extract_names_mode"))]
+pub type ByteSymbol = Vec<u8>;
 
 #[cfg(all(not(feature = "extract_names_mode"), feature = "rustc"))]
 impl<'t, S> SInto<S, Symbol> for rustc_span::symbol::Symbol {
@@ -29,6 +31,13 @@ impl<'t, S> SInto<S, Symbol> for rustc_span::symbol::Symbol {
     }
 }
 
+#[cfg(all(not(feature = "extract_names_mode"), feature = "rustc"))]
+impl<'t, S> SInto<S, ByteSymbol> for rustc_span::symbol::ByteSymbol {
+    fn sinto(&self, _s: &S) -> ByteSymbol {
+        self.as_byte_str().to_owned()
+    }
+}
+
 /// Reflects [`hir::Safety`]
 #[cfg_attr(not(feature = "extract_names_mode"), derive(AdtInto, JsonSchema))]
 #[cfg_attr(not(feature = "extract_names_mode"), args(<S>, from: hir::Safety, state: S as _s))]

frontend/exporter/src/types/def_id.rs

@@ -1051,8 +1051,8 @@ pub enum StrStyle {
 #[derive(Clone, Debug, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord)]
 pub enum LitKind {
     Str(Symbol, StrStyle),
-    ByteStr(Vec<u8>, StrStyle),
-    CStr(Vec<u8>, StrStyle),
+    ByteStr(ByteSymbol, StrStyle),
+    CStr(ByteSymbol, StrStyle),
     Byte(u8),
     Char(char),
     Int(

frontend/exporter/src/types/hir.rs

@@ -94,22 +94,22 @@ pub struct ExistentialProjection {
 #[args(<S>, from: ty::DynKind, state: S as _s)]
 pub enum DynKind {
     Dyn,
-    DynStar,
 }
 
 /// Reflects [`ty::BoundTyKind`]
 #[derive_group(Serializers)]
 #[derive(AdtInto, Clone, Debug, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::BoundTyKind, state: S as gstate)]
+#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::BoundTyKind, state: S as s)]
 pub enum BoundTyKind {
     Anon,
+    #[custom_arm(&FROM_TYPE::Param(def_id) => TO_TYPE::Param(def_id.sinto(s), s.base().tcx.item_name(def_id).sinto(s)),)]
     Param(DefId, Symbol),
 }
 
 /// Reflects [`ty::BoundTy`]
 #[derive_group(Serializers)]
 #[derive(AdtInto, Clone, Debug, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::BoundTy, state: S as gstate)]
+#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::BoundTy, state: S as s)]
 pub struct BoundTy {
     pub var: BoundVar,
     pub kind: BoundTyKind,
@@ -120,17 +120,19 @@ sinto_as_usize!(rustc_middle::ty, BoundVar);
 /// Reflects [`ty::BoundRegionKind`]
 #[derive_group(Serializers)]
 #[derive(AdtInto, Clone, Debug, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::BoundRegionKind, state: S as gstate)]
+#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::BoundRegionKind, state: S as s)]
 pub enum BoundRegionKind {
     Anon,
+    NamedAnon(Symbol),
+    #[custom_arm(&FROM_TYPE::Named(def_id) => TO_TYPE::Named(def_id.sinto(s), s.base().tcx.item_name(def_id).sinto(s)),)]
     Named(DefId, Symbol),
     ClosureEnv,
 }
 
 /// Reflects [`ty::BoundRegion`]
 #[derive_group(Serializers)]
 #[derive(AdtInto, Clone, Debug, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::BoundRegion, state: S as gstate)]
+#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::BoundRegion, state: S as s)]
 pub struct BoundRegion {
     pub var: BoundVar,
     pub kind: BoundRegionKind,
@@ -370,7 +372,7 @@ impl VariantDef {
 /// Reflects [`ty::EarlyParamRegion`]
 #[derive_group(Serializers)]
 #[derive(AdtInto, Clone, Debug, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::EarlyParamRegion, state: S as gstate)]
+#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::EarlyParamRegion, state: S as s)]
 pub struct EarlyParamRegion {
     pub index: u32,
     pub name: Symbol,
@@ -379,7 +381,7 @@ pub struct EarlyParamRegion {
 /// Reflects [`ty::LateParamRegion`]
 #[derive_group(Serializers)]
 #[derive(AdtInto, Clone, Debug, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::LateParamRegion, state: S as gstate)]
+#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::LateParamRegion, state: S as s)]
 pub struct LateParamRegion {
     pub scope: DefId,
     pub kind: LateParamRegionKind,
@@ -388,9 +390,11 @@ pub struct LateParamRegion {
 /// Reflects [`ty::LateParamRegionKind`]
 #[derive_group(Serializers)]
 #[derive(AdtInto, Clone, Debug, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::LateParamRegionKind, state: S as gstate)]
+#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: ty::LateParamRegionKind, state: S as s)]
 pub enum LateParamRegionKind {
     Anon(u32),
+    NamedAnon(u32, Symbol),
+    #[custom_arm(&FROM_TYPE::Named(def_id) => TO_TYPE::Named(def_id.sinto(s), s.base().tcx.item_name(def_id).sinto(s)),)]
     Named(DefId, Symbol),
     ClosureEnv,
 }
@@ -1078,7 +1082,6 @@ pub enum PointerCoercion {
     ClosureFnPointer(Safety),
     MutToConstPointer,
     ArrayToPointer,
-    DynStar,
     Unsize,
 }
 

frontend/exporter/src/types/ty.rs

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2025-06-30"
+channel = "nightly-2025-07-08"
 components = [ "rustc-dev", "llvm-tools-preview" , "rust-analysis" , "rust-src" , "rustfmt" ]