diff options
| author | bors <bors@rust-lang.org> | 2025-10-01 14:36:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-10-01 14:36:51 +0000 |
| commit | d4ae855111df8c7ee255bea4c112e74b7d72cf45 (patch) | |
| tree | 1061cf71bca8dcba2ac269aaa753d99f1fb12daa /src/librustdoc/html/render/context.rs | |
| parent | 1e1a39441bd11aba541a48ba714d939490fc7b85 (diff) | |
| parent | de20efd01e560f74649b95c1e48c8e5e21c82269 (diff) | |
| download | rust-d4ae855111df8c7ee255bea4c112e74b7d72cf45.tar.gz rust-d4ae855111df8c7ee255bea4c112e74b7d72cf45.zip | |
Auto merge of #147220 - Zalathar:rollup-fubv0wy, r=Zalathar
Rollup of 11 pull requests Successful merges: - rust-lang/rust#146918 (add regression test) - rust-lang/rust#146980 (simplify setup_constraining_predicates, and note it is potentially cubic) - rust-lang/rust#147170 (compiletest: Pass around `DirectiveLine` instead of bare strings) - rust-lang/rust#147180 (add tests) - rust-lang/rust#147188 (Remove usage of `compiletest-use-stage0-libtest` from CI) - rust-lang/rust#147189 (Replace `rustc_span::Span` with a stripped down version for librustdoc's highlighter) - rust-lang/rust#147199 (remove outdated comment in (inner) `InferCtxt`) - rust-lang/rust#147200 (Fix autodiff empty ret regression) - rust-lang/rust#147209 (Remove `no-remap-src-base` from tests) - rust-lang/rust#147213 (Fix broken STD build for ESP-IDF) - rust-lang/rust#147217 (Don't create a top-level `true` directory when running UI tests) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc/html/render/context.rs')
| -rw-r--r-- | src/librustdoc/html/render/context.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustdoc/html/render/context.rs b/src/librustdoc/html/render/context.rs index 5f92ab2fada..4c06d0da470 100644 --- a/src/librustdoc/html/render/context.rs +++ b/src/librustdoc/html/render/context.rs @@ -30,6 +30,7 @@ use crate::formats::item_type::ItemType; use crate::html::escape::Escape; use crate::html::macro_expansion::ExpandedCode; use crate::html::markdown::{self, ErrorCodes, IdMap, plain_text_summary}; +use crate::html::render::span_map::Span; use crate::html::render::write_shared::write_shared; use crate::html::url_parts_builder::UrlPartsBuilder; use crate::html::{layout, sources, static_files}; @@ -139,7 +140,7 @@ pub(crate) struct SharedContext<'tcx> { /// Correspondence map used to link types used in the source code pages to allow to click on /// links to jump to the type's definition. - pub(crate) span_correspondence_map: FxHashMap<rustc_span::Span, LinkFromSrc>, + pub(crate) span_correspondence_map: FxHashMap<Span, LinkFromSrc>, pub(crate) expanded_codes: FxHashMap<BytePos, Vec<ExpandedCode>>, /// The [`Cache`] used during rendering. pub(crate) cache: Cache, |