Rollup of 10 pull requests #151634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

rust-bors merged 31 commits into rust-lang:main from matthiaskrgr:rollup-cE0JR24

Jan 25, 2026

RELEASES.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -62,9 +62,9 @@ Stabilized APIs
  
    - [`<uN>::unchecked_shl`](https://doc.rust-lang.org/stable/std/primitive.usize.html#method.unchecked_shl)

    - [`<uN>::unchecked_shr`](https://doc.rust-lang.org/stable/std/primitive.usize.html#method.unchecked_shr)

    - [`<[T]>::as_array`](https://doc.rust-lang.org/stable/std/primitive.slice.html#method.as_array)

    - [`<[T]>::as_array_mut`](https://doc.rust-lang.org/stable/std/primitive.slice.html#method.as_mut_array)

    - [`<[T]>::as_mut_array`](https://doc.rust-lang.org/stable/std/primitive.slice.html#method.as_mut_array)

    - [`<*const [T]>::as_array`](https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.as_array)

    - [`<*mut [T]>::as_array_mut`](https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.as_mut_array)

    - [`<*mut [T]>::as_mut_array`](https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.as_mut_array)

    - [`VecDeque::pop_front_if`](https://doc.rust-lang.org/stable/std/collections/struct.VecDeque.html#method.pop_front_if)

    - [`VecDeque::pop_back_if`](https://doc.rust-lang.org/stable/std/collections/struct.VecDeque.html#method.pop_back_if)

    - [`Duration::from_nanos_u128`](https://doc.rust-lang.org/stable/std/time/struct.Duration.html#method.from_nanos_u128)

compiler/rustc_expand/src/proc_macro_server.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -431,8 +431,6 @@ impl ToInternal<rustc_errors::Level> for Level {
  
        }

    }

    pub(crate) struct FreeFunctions;

    pub(crate) struct Rustc<'a, 'b> {

        ecx: &'a mut ExtCtxt<'b>,

        def_site: Span,

    @@ -461,13 +459,28 @@ impl<'a, 'b> Rustc<'a, 'b> {
  
    }

    impl server::Types for Rustc<'_, '_> {

        type FreeFunctions = FreeFunctions;

        type TokenStream = TokenStream;

        type Span = Span;

        type Symbol = Symbol;

    }

    impl server::FreeFunctions for Rustc<'_, '_> {

    impl server::Server for Rustc<'_, '_> {

        fn globals(&mut self) -> ExpnGlobals<Self::Span> {

            ExpnGlobals {

                def_site: self.def_site,

                call_site: self.call_site,

                mixed_site: self.mixed_site,

            }

        }

        fn intern_symbol(string: &str) -> Self::Symbol {

            Symbol::intern(string)

        }

        fn with_symbol_string(symbol: &Self::Symbol, f: impl FnOnce(&str)) {

            f(symbol.as_str())

        }

        fn injected_env_var(&mut self, var: &str) -> Option<String> {

            self.ecx.sess.opts.logical_env.get(var).cloned()

        }

    @@ -552,14 +565,20 @@ impl server::FreeFunctions for Rustc<'_, '_> {
  
            }

            diag.emit();

        }

    }

    impl server::TokenStream for Rustc<'_, '_> {

        fn is_empty(&mut self, stream: &Self::TokenStream) -> bool {

        fn ts_drop(&mut self, stream: Self::TokenStream) {

            drop(stream);

        }

        fn ts_clone(&mut self, stream: &Self::TokenStream) -> Self::TokenStream {

            stream.clone()

        }

        fn ts_is_empty(&mut self, stream: &Self::TokenStream) -> bool {

            stream.is_empty()

        }

        fn from_str(&mut self, src: &str) -> Self::TokenStream {

        fn ts_from_str(&mut self, src: &str) -> Self::TokenStream {

            unwrap_or_emit_fatal(source_str_to_stream(

                self.psess(),

                FileName::proc_macro_source_code(src),

    @@ -568,11 +587,11 @@ impl server::TokenStream for Rustc<'_, '_> {
  
            ))

        }

        fn to_string(&mut self, stream: &Self::TokenStream) -> String {

        fn ts_to_string(&mut self, stream: &Self::TokenStream) -> String {

            pprust::tts_to_string(stream)

        }

        fn expand_expr(&mut self, stream: &Self::TokenStream) -> Result<Self::TokenStream, ()> {

        fn ts_expand_expr(&mut self, stream: &Self::TokenStream) -> Result<Self::TokenStream, ()> {

            // Parse the expression from our tokenstream.

            let expr: PResult<'_, _> = try {

                let mut p = Parser::new(self.psess(), stream.clone(), Some("proc_macro expand expr"));

    @@ -633,14 +652,14 @@ impl server::TokenStream for Rustc<'_, '_> {
  
            }

        }

        fn from_token_tree(

        fn ts_from_token_tree(

            &mut self,

            tree: TokenTree<Self::TokenStream, Self::Span, Self::Symbol>,

        ) -> Self::TokenStream {

            Self::TokenStream::new((tree, &mut *self).to_internal().into_iter().collect::<Vec<_>>())

        }

        fn concat_trees(

        fn ts_concat_trees(

            &mut self,

            base: Option<Self::TokenStream>,

            trees: Vec<TokenTree<Self::TokenStream, Self::Span, Self::Symbol>>,

    @@ -654,7 +673,7 @@ impl server::TokenStream for Rustc<'_, '_> {
  
            stream

        }

        fn concat_streams(

        fn ts_concat_streams(

            &mut self,

            base: Option<Self::TokenStream>,

            streams: Vec<Self::TokenStream>,

    @@ -666,24 +685,22 @@ impl server::TokenStream for Rustc<'_, '_> {
  
            stream

        }

        fn into_trees(

        fn ts_into_trees(

            &mut self,

            stream: Self::TokenStream,

        ) -> Vec<TokenTree<Self::TokenStream, Self::Span, Self::Symbol>> {

            FromInternal::from_internal((stream, self))

        }

    }

    impl server::Span for Rustc<'_, '_> {

        fn debug(&mut self, span: Self::Span) -> String {

        fn span_debug(&mut self, span: Self::Span) -> String {

            if self.ecx.ecfg.span_debug {

                format!("{span:?}")

            } else {

                format!("{:?} bytes({}..{})", span.ctxt(), span.lo().0, span.hi().0)

            }

        }

        fn file(&mut self, span: Self::Span) -> String {

        fn span_file(&mut self, span: Self::Span) -> String {

            self.psess()

                .source_map()

                .lookup_char_pos(span.lo())

    @@ -693,7 +710,7 @@ impl server::Span for Rustc<'_, '_> {
  
                .to_string()

        }

        fn local_file(&mut self, span: Self::Span) -> Option<String> {

        fn span_local_file(&mut self, span: Self::Span) -> Option<String> {

            self.psess()

                .source_map()

                .lookup_char_pos(span.lo())

    @@ -708,41 +725,41 @@ impl server::Span for Rustc<'_, '_> {
  
                })

        }

        fn parent(&mut self, span: Self::Span) -> Option<Self::Span> {

        fn span_parent(&mut self, span: Self::Span) -> Option<Self::Span> {

            span.parent_callsite()

        }

        fn source(&mut self, span: Self::Span) -> Self::Span {

        fn span_source(&mut self, span: Self::Span) -> Self::Span {

            span.source_callsite()

        }

        fn byte_range(&mut self, span: Self::Span) -> Range<usize> {

        fn span_byte_range(&mut self, span: Self::Span) -> Range<usize> {

            let source_map = self.psess().source_map();

            let relative_start_pos = source_map.lookup_byte_offset(span.lo()).pos;

            let relative_end_pos = source_map.lookup_byte_offset(span.hi()).pos;

            Range { start: relative_start_pos.0 as usize, end: relative_end_pos.0 as usize }

        }

        fn start(&mut self, span: Self::Span) -> Self::Span {

        fn span_start(&mut self, span: Self::Span) -> Self::Span {

            span.shrink_to_lo()

        }

        fn end(&mut self, span: Self::Span) -> Self::Span {

        fn span_end(&mut self, span: Self::Span) -> Self::Span {

            span.shrink_to_hi()

        }

        fn line(&mut self, span: Self::Span) -> usize {

        fn span_line(&mut self, span: Self::Span) -> usize {

            let loc = self.psess().source_map().lookup_char_pos(span.lo());

            loc.line

        }

        fn column(&mut self, span: Self::Span) -> usize {

        fn span_column(&mut self, span: Self::Span) -> usize {

            let loc = self.psess().source_map().lookup_char_pos(span.lo());

            loc.col.to_usize() + 1

        }

        fn join(&mut self, first: Self::Span, second: Self::Span) -> Option<Self::Span> {

        fn span_join(&mut self, first: Self::Span, second: Self::Span) -> Option<Self::Span> {

            let self_loc = self.psess().source_map().lookup_char_pos(first.lo());

            let other_loc = self.psess().source_map().lookup_char_pos(second.lo());

    @@ -753,7 +770,7 @@ impl server::Span for Rustc<'_, '_> {
  
            Some(first.to(second))

        }

        fn subspan(

        fn span_subspan(

            &mut self,

            span: Self::Span,

            start: Bound<usize>,

    @@ -789,11 +806,11 @@ impl server::Span for Rustc<'_, '_> {
  
            Some(span.with_lo(new_lo).with_hi(new_hi))

        }

        fn resolved_at(&mut self, span: Self::Span, at: Self::Span) -> Self::Span {

        fn span_resolved_at(&mut self, span: Self::Span, at: Self::Span) -> Self::Span {

            span.with_ctxt(at.ctxt())

        }

        fn source_text(&mut self, span: Self::Span) -> Option<String> {

        fn span_source_text(&mut self, span: Self::Span) -> Option<String> {

            self.psess().source_map().span_to_snippet(span).ok()

        }

    @@ -821,41 +838,21 @@ impl server::Span for Rustc<'_, '_> {
  
        /// span from the metadata of `my_proc_macro` (which we have access to,

        /// since we've loaded `my_proc_macro` from disk in order to execute it).

        /// In this way, we have obtained a span pointing into `my_proc_macro`

        fn save_span(&mut self, span: Self::Span) -> usize {

        fn span_save_span(&mut self, span: Self::Span) -> usize {

            self.psess().save_proc_macro_span(span)

        }

        fn recover_proc_macro_span(&mut self, id: usize) -> Self::Span {

        fn span_recover_proc_macro_span(&mut self, id: usize) -> Self::Span {

            let (resolver, krate, def_site) = (&*self.ecx.resolver, self.krate, self.def_site);

            *self.rebased_spans.entry(id).or_insert_with(|| {

                // FIXME: `SyntaxContext` for spans from proc macro crates is lost during encoding,

                // replace it with a def-site context until we are encoding it properly.

                resolver.get_proc_macro_quoted_span(krate, id).with_ctxt(def_site.ctxt())

            })

        }

    }

    impl server::Symbol for Rustc<'_, '_> {

        fn normalize_and_validate_ident(&mut self, string: &str) -> Result<Self::Symbol, ()> {

        fn symbol_normalize_and_validate_ident(&mut self, string: &str) -> Result<Self::Symbol, ()> {

            let sym = nfc_normalize(string);

            if rustc_lexer::is_ident(sym.as_str()) { Ok(sym) } else { Err(()) }

        }

    }

    impl server::Server for Rustc<'_, '_> {

        fn globals(&mut self) -> ExpnGlobals<Self::Span> {

            ExpnGlobals {

                def_site: self.def_site,

                call_site: self.call_site,

                mixed_site: self.mixed_site,

            }

        }

        fn intern_symbol(string: &str) -> Self::Symbol {

            Symbol::intern(string)

        }

        fn with_symbol_string(symbol: &Self::Symbol, f: impl FnOnce(&str)) {

            f(symbol.as_str())

        }

    }

compiler/rustc_interface/src/callbacks.rs

-Original file line number
+Diff line change
@@ Expand Up @@
     pub fn dep_kind_debug(kind: DepKind, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         tls::with_opt(|opt_tcx| {
             if let Some(tcx) = opt_tcx {
-                write!(f, "{}", tcx.dep_kind_info(kind).name)
+                write!(f, "{}", tcx.dep_kind_vtable(kind).name)
             } else {
                 default_dep_kind_debug(kind, f)
             }
@@ Expand Down @@

compiler/rustc_interface/src/passes.rs

-Original file line number
+Diff line change
@@ Expand Up @@
                 hir_arena,
                 untracked,
                 dep_graph,
-                rustc_query_impl::query_callbacks(arena),
+                rustc_query_impl::make_dep_kind_vtables(arena),
                 rustc_query_impl::query_system(
                     providers.queries,
                     providers.extern_queries,
@@ Expand Down @@

compiler/rustc_middle/src/arena.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -104,7 +104,7 @@ macro_rules! arena_types {
  
                [decode] is_late_bound_map: rustc_data_structures::fx::FxIndexSet<rustc_hir::ItemLocalId>,

                [decode] impl_source: rustc_middle::traits::ImplSource<'tcx, ()>,

                [] dep_kind: rustc_middle::dep_graph::DepKindStruct<'tcx>,

                [] dep_kind_vtable: rustc_middle::dep_graph::DepKindVTable<'tcx>,

                [decode] trait_impl_trait_tys:

                    rustc_data_structures::unord::UnordMap<

compiler/rustc_middle/src/dep_graph/mod.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -18,7 +18,7 @@ pub use rustc_query_system::dep_graph::{
  
    pub type DepGraph = rustc_query_system::dep_graph::DepGraph<DepsType>;

    pub type DepKindStruct<'tcx> = rustc_query_system::dep_graph::DepKindStruct<TyCtxt<'tcx>>;

    pub type DepKindVTable<'tcx> = rustc_query_system::dep_graph::DepKindVTable<TyCtxt<'tcx>>;

    pub struct DepsType;

    @@ -79,8 +79,8 @@ impl<'tcx> DepContext for TyCtxt<'tcx> {
  
        }

        #[inline]

        fn dep_kind_info(&self, dk: DepKind) -> &DepKindStruct<'tcx> {

            &self.query_kinds[dk.as_usize()]

        fn dep_kind_vtable(&self, dk: DepKind) -> &DepKindVTable<'tcx> {

            &self.dep_kind_vtables[dk.as_usize()]

        }

        fn with_reduced_queries<T>(self, f: impl FnOnce() -> T) -> T {

compiler/rustc_middle/src/ty/context.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -59,7 +59,7 @@ use rustc_type_ir::{
  
    use tracing::{debug, instrument};

    use crate::arena::Arena;

    use crate::dep_graph::{DepGraph, DepKindStruct};

    use crate::dep_graph::{DepGraph, DepKindVTable};

    use crate::infer::canonical::{CanonicalParamEnvCache, CanonicalVarKind, CanonicalVarKinds};

    use crate::lint::lint_level;

    use crate::metadata::ModChild;

    @@ -1580,7 +1580,7 @@ pub struct GlobalCtxt<'tcx> {
  
        untracked: Untracked,

        pub query_system: QuerySystem<'tcx>,

        pub(crate) query_kinds: &'tcx [DepKindStruct<'tcx>],

        pub(crate) dep_kind_vtables: &'tcx [DepKindVTable<'tcx>],

        // Internal caches for metadata decoding. No need to track deps on this.

        pub ty_rcache: Lock<FxHashMap<ty::CReaderCacheKey, Ty<'tcx>>>,

    @@ -1801,7 +1801,7 @@ impl<'tcx> TyCtxt<'tcx> {
  
            hir_arena: &'tcx WorkerLocal<hir::Arena<'tcx>>,

            untracked: Untracked,

            dep_graph: DepGraph,

            query_kinds: &'tcx [DepKindStruct<'tcx>],

            dep_kind_vtables: &'tcx [DepKindVTable<'tcx>],

            query_system: QuerySystem<'tcx>,

            hooks: crate::hooks::Providers,

            current_gcx: CurrentGcx,

    @@ -1831,7 +1831,7 @@ impl<'tcx> TyCtxt<'tcx> {
  
                consts: common_consts,

                untracked,

                query_system,

                query_kinds,

                dep_kind_vtables,

                ty_rcache: Default::default(),

                selection_cache: Default::default(),

                evaluation_cache: Default::default(),

compiler/rustc_query_impl/src/lib.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ @@
     use rustc_data_structures::stable_hasher::HashStable;
     use rustc_data_structures::sync::AtomicU64;
     use rustc_middle::arena::Arena;
-    use rustc_middle::dep_graph::{self, DepKind, DepKindStruct, DepNodeIndex};
+    use rustc_middle::dep_graph::{self, DepKind, DepKindVTable, DepNodeIndex};
     use rustc_middle::query::erase::{Erase, erase, restore};
     use rustc_middle::query::on_disk_cache::{CacheEncoder, EncodedDepNodeIndex, OnDiskCache};
     use rustc_middle::query::plumbing::{DynamicQuery, QuerySystem, QuerySystemFns};
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 10 pull requests #151634

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!