Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-01 22:18:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't create a path with zero segments

Browse Source
This commit is contained in:
León Orell Valerian Liehr
2026-05-10 18:23:50 +02:00
parent f5ad60c7da
commit bfcaf513b4
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/librustdoc/html/render/span_map.rs
+15 -28
View File
@@ -135,37 +135,26 @@ fn link_for_def(&self, def_id: DefId) -> LinkFromSrc {
/// This function is where we handle `hir::Path` elements and add them into the "span map".
fn handle_path(&mut self, path: &hir::Path<'_>, only_use_last_segment: bool) {
match path.res {
// FIXME: For now, we handle `DefKind` if it's not a `DefKind::TyParam`.
// Would be nice to support them too alongside the other `DefKind`
// (such as primitive types!).
Res::Def(kind, def_id) if kind != DefKind::TyParam => {
// FIXME: Properly support type parameters. Note they resolve just fine. The issue is
// that our highlighter would then also linkify their *definition site* for some reason
// linking them to themselves. Const parameters don't exhibit this issue.
Res::Def(DefKind::TyParam, _) => {}
Res::Def(_, def_id) => {
// The segments can be empty for `use *;` in a non-crate-root scope in Rust 2015.
let span = path.segments.last().map_or(path.span, |seg| seg.ident.span);
// In case the path ends with generics, we remove them from the span.
let span = if only_use_last_segment
&& let Some(path_span) = path.segments.last().map(|segment| segment.ident.span)
{
path_span
let span = if only_use_last_segment {
span
} else {
path.segments
.last()
.map(|last| {
// In `use` statements, the included item is not in the path segments.
// However, it doesn't matter because you can't have generics on `use`
// statements.
if path.span.contains(last.ident.span) {
path.span.with_hi(last.ident.span.hi())
} else {
path.span
}
})
.unwrap_or(path.span)
// In `use` statements, the included item is not in the path segments. However,
// it doesn't matter because you can't have generics on `use` statements.
if path.span.contains(span) { path.span.with_hi(span.hi()) } else { path.span }
};
self.matches.insert(span.into(), self.link_for_def(def_id));
}
Res::Local(_) if let Some(span) = self.tcx.hir_res_span(path.res) => {
let path_span = if only_use_last_segment
&& let Some(path_span) = path.segments.last().map(|segment| segment.ident.span)
{
path_span
let path_span = if only_use_last_segment {
path.segments.last().unwrap().ident.span
} else {
path.span
};
@@ -176,7 +165,6 @@ fn handle_path(&mut self, path: &hir::Path<'_>, only_use_last_segment: bool) {
self.matches
.insert(path.span.into(), LinkFromSrc::Primitive(PrimitiveType::from(p)));
}
Res::Err => {}
_ => {}
}
}
@@ -288,8 +276,7 @@ fn visit_qpath(&mut self, qpath: &QPath<'tcx>, id: HirId, _span: rustc_span::Spa
// We change the span to not include parens.
span: segment.ident.span,
res: typeck_results.qpath_res(qpath, id),
// FIXME(fmease): Don't create a path with zero segments!
segments: &[],
segments: std::slice::from_ref(segment),
};
self.handle_path(&path, false);
}