bump toolchain and fix compilation errors in codegen

Author: makspll

codegen/rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
 components = ["clippy", "rust-src", "rustc-dev", "llvm-tools"]
-channel = "nightly-2025-06-27"
+channel = "nightly-2025-11-08"

codegen/src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(rustc_private, let_chains)]
+#![feature(rustc_private)]
 #![deny(rustc::internal)]
 
 extern crate rustc_ast;

codegen/src/passes/cache_traits.rs

@@ -10,7 +10,7 @@ use crate::{
 
 fn dump_traits(tcx: &TyCtxt) -> String {
     let mut buffer = String::new();
-    for t in tcx.all_traits() {
+    for t in tcx.all_traits_including_private() {
         buffer.push_str(&tcx.def_path_str(t));
         buffer.push_str(", ");
     }
@@ -21,7 +21,7 @@ fn dump_traits(tcx: &TyCtxt) -> String {
 pub(crate) fn cache_traits(ctxt: &mut BevyCtxt<'_>, _args: &Args) -> bool {
     let tcx = &ctxt.tcx;
 
-    for trait_did in tcx.all_traits() {
+    for trait_did in tcx.all_traits_including_private() {
         let def_path_str = tcx.def_path_str(trait_did);
         if DEF_PATHS_REFLECT.contains(&def_path_str.as_str()) {
             trace!("found Reflect trait def id: {trait_did:?}");

codegen/src/passes/find_methods_and_fields.rs

@@ -32,7 +32,7 @@ pub(crate) fn find_methods_and_fields(ctxt: &mut BevyCtxt<'_>, _args: &Args) ->
                     .variants()
                     .iter()
                     .flat_map(|variant| {
-                        if has_reflect_ignore_attr(ctxt.tcx.get_attrs_unchecked(variant.def_id)) {
+                        if has_reflect_ignore_attr(ctxt.tcx.get_all_attrs(variant.def_id)) {
                             // TODO: is this the right approach? do we need to still include those variants? or do we just provide dummies
                             // or can we just skip those ?
                             info!(
@@ -159,7 +159,7 @@ pub(crate) fn find_methods_and_fields(ctxt: &mut BevyCtxt<'_>, _args: &Args) ->
 
                     let trait_did = ctxt
                         .tcx
-                        .impl_trait_ref(*impl_did)
+                        .impl_opt_trait_ref(*impl_did)
                         .map(|tr| tr.skip_binder().def_id);
                     let trait_name = trait_did
                         .map(|td| ctxt.tcx.item_name(td).to_ident_string())
@@ -353,7 +353,8 @@ fn process_fields<'tcx, 'f, I: Iterator<Item = &'f FieldDef>>(
                 return (f.did, crate::ReflectionStrategy::Filtered);
             }
 
-            let field_ty = tcx.erase_regions(tcx.type_of(f.did).instantiate_identity());
+            let field_ty =
+                tcx.erase_and_anonymize_regions(tcx.type_of(f.did).instantiate_identity());
             if type_is_supported_as_non_proxy_arg(tcx, param_env, cached_traits, field_ty)
                 && type_is_supported_as_non_proxy_return_val(
                     tcx,
@@ -367,7 +368,7 @@ fn process_fields<'tcx, 'f, I: Iterator<Item = &'f FieldDef>>(
                 && type_is_supported_as_proxy_return_val(tcx, reflect_types, meta_loader, field_ty)
             {
                 (f.did, crate::ReflectionStrategy::Proxy)
-            } else if !has_reflect_ignore_attr(tcx.get_attrs_unchecked(f.did)) {
+            } else if !has_reflect_ignore_attr(tcx.get_all_attrs(f.did)) {
                 (f.did, crate::ReflectionStrategy::Reflection)
             } else {
                 (f.did, crate::ReflectionStrategy::Filtered)
@@ -487,7 +488,9 @@ fn type_is_supported_as_non_proxy_return_val<'tcx>(
         "Checkign type is supported as non proxy return val: '{ty:?}' with param_env: '{param_env:?}'"
     );
     if let TyKind::Ref(region, _, _) = ty.kind()
-        && region.get_name().is_none_or(|rn| rn.as_str() != "'static")
+        && region
+            .get_name(tcx)
+            .is_none_or(|rn| rn.as_str() != "'static")
     {
         return false;
     }

codegen/src/passes/find_trait_impls.rs

@@ -146,10 +146,7 @@ fn impl_matches<'tcx>(infcx: &InferCtxt<'tcx>, ty: Ty<'tcx>, impl_def_id: DefId)
         let param_env = typing_env.with_post_analysis_normalized(tcx).param_env;
         let impl_args = infcx.fresh_args_for_item(DUMMY_SP, impl_def_id);
 
-        let impl_trait_ref = tcx
-            .impl_trait_ref(impl_def_id)
-            .expect("Expected defid to be an impl for a trait")
-            .instantiate(tcx, impl_args);
+        let impl_trait_ref = tcx.impl_trait_ref(impl_def_id).instantiate(tcx, impl_args);
         let impl_trait_ref = ocx.normalize(&ObligationCause::dummy(), param_env, impl_trait_ref);
         let impl_trait_ref_ty = impl_trait_ref.self_ty();
         if ocx
@@ -164,7 +161,7 @@ fn impl_matches<'tcx>(infcx: &InferCtxt<'tcx>, ty: Ty<'tcx>, impl_def_id: DefId)
             Obligation::new(tcx, ObligationCause::dummy(), param_env, predicate)
         }));
 
-        ocx.select_where_possible().is_empty()
+        ocx.try_evaluate_obligations().is_empty()
     };
 
     infcx.probe(|_| impl_may_apply(impl_def_id))

codegen/src/passes/populate_template_data.rs

@@ -57,7 +57,7 @@ pub(crate) fn populate_template_data(ctxt: &mut BevyCtxt<'_>, args: &Args) -> bo
             .variants()
             .iter()
             .map(|variant| Variant {
-                docstrings: docstrings(ctxt.tcx.get_attrs_unchecked(variant.def_id)),
+                docstrings: docstrings(ctxt.tcx.get_all_attrs(variant.def_id)),
                 name: variant.name.to_ident_string().into(),
                 fields: process_fields(ctxt, variant.fields.iter(), &ty_ctxt),
             })
@@ -71,7 +71,7 @@ pub(crate) fn populate_template_data(ctxt: &mut BevyCtxt<'_>, args: &Args) -> bo
             is_enum: variants.len() > 1,
             variants,
             is_tuple_struct,
-            docstrings: docstrings(tcx.get_attrs_unchecked(reflect_ty_did)),
+            docstrings: docstrings(tcx.get_all_attrs(reflect_ty_did)),
             impls_clone: trait_impls.contains_key(&clone_diagnostic),
             impls_debug: trait_impls.contains_key(&debug_diagnostic),
             impls_display: trait_impls.contains_key(&display_diagnostic),
@@ -110,7 +110,7 @@ pub(crate) fn process_fields<'f, I: Iterator<Item = &'f FieldDef>>(
 ) -> Vec<Field> {
     fields
         .map(|field| Field {
-            docstrings: docstrings(ctxt.tcx.get_attrs_unchecked(field.did)),
+            docstrings: docstrings(ctxt.tcx.get_all_attrs(field.did)),
             ident: field.name.to_ident_string(),
             ty: ty_to_string(ctxt, ctxt.tcx.type_of(field.did).skip_binder(), false),
             reflection_strategy: *ty_ctxt
@@ -163,9 +163,9 @@ pub(crate) fn process_functions(ctxt: &BevyCtxt, fns: &[FunctionContext]) -> Vec
                 args,
                 output,
                 has_self: fn_ctxt.has_self,
-                docstrings: docstrings(ctxt.tcx.get_attrs_unchecked(fn_ctxt.def_id)),
+                docstrings: docstrings(ctxt.tcx.get_all_attrs(fn_ctxt.def_id)),
                 from_trait_path: fn_ctxt.trait_and_impl_did.map(|(_, impl_did)| {
-                    let trait_ref = ctxt.tcx.impl_trait_ref(impl_did).unwrap().skip_binder();
+                    let trait_ref = ctxt.tcx.impl_trait_ref(impl_did).skip_binder();
 
                     trait_ref_to_string(ctxt, trait_ref)
                 }),
@@ -239,7 +239,7 @@ fn trait_ref_to_string<'tcx>(ctxt: &BevyCtxt<'tcx>, trait_ref: TraitRef<'tcx>) -
         // filter out non const | type generics and the compiler generated ones
         .filter(|(_, arg_def)| match arg_def.kind {
             GenericParamDefKind::Lifetime => false,
-            GenericParamDefKind::Const { synthetic, .. } => !synthetic,
+            GenericParamDefKind::Type { synthetic, .. } => !synthetic,
             _ => true,
         })
         .map(|(arg, arg_def)| {