Rollup merge of #108988 - adrianheine:crate-reference-block, r=petrochenkov

rustdoc: Don't crash on `crate` references in blocks

This is a regression from #94857.
This commit is contained in:
Matthias Krüger 2023-03-11 12:55:45 +01:00 committed by GitHub
commit e12ba7300a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions

View File

@ -1849,20 +1849,12 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
&mut self,
path_str: &str,
ns: Namespace,
mut parent_scope: ParentScope<'a>,
parent_scope: ParentScope<'a>,
) -> Option<Res> {
let mut segments =
Vec::from_iter(path_str.split("::").map(Ident::from_str).map(Segment::from_ident));
if let Some(segment) = segments.first_mut() {
if segment.ident.name == kw::Crate {
// FIXME: `resolve_path` always resolves `crate` to the current crate root, but
// rustdoc wants it to resolve to the `parent_scope`'s crate root. This trick of
// replacing `crate` with `self` and changing the current module should achieve
// the same effect.
segment.ident.name = kw::SelfLower;
parent_scope.module =
self.expect_module(parent_scope.module.def_id().krate.as_def_id());
} else if segment.ident.name == kw::Empty {
if segment.ident.name == kw::Empty {
segment.ident.name = kw::PathRoot;
}
}

View File

@ -0,0 +1,5 @@
// check-pass
fn main() {
/// [](crate)
struct X;
}