From ae38f3572041aa7779f01628e08f707a434ae2a6 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Mon, 25 Apr 2022 15:38:43 -0700 Subject: [PATCH 1/2] rustdoc: do not write `{{root}}` in `pub use ::foo` docs --- src/librustdoc/html/format.rs | 3 ++- src/test/rustdoc/issue-95873.rs | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/test/rustdoc/issue-95873.rs diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index d3545236e3dfe..118807a82864f 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -18,6 +18,7 @@ use rustc_hir::def_id::DefId; use rustc_middle::ty; use rustc_middle::ty::DefIdTree; use rustc_middle::ty::TyCtxt; +use rustc_span::symbol::kw; use rustc_span::{sym, Symbol}; use rustc_target::spec::abi::Abi; @@ -679,7 +680,7 @@ fn resolved_path<'cx>( if print_all { for seg in &path.segments[..path.segments.len() - 1] { - write!(w, "{}::", seg.name)?; + write!(w, "{}::", if seg.name == kw::PathRoot { "" } else { seg.name.as_str() })?; } } if w.alternate() { diff --git a/src/test/rustdoc/issue-95873.rs b/src/test/rustdoc/issue-95873.rs new file mode 100644 index 0000000000000..1ed7e582275db --- /dev/null +++ b/src/test/rustdoc/issue-95873.rs @@ -0,0 +1,2 @@ +// @!has issue_95873/index.html '{{root}}' +pub use ::std as x; From c2a9a685819abcf2050bd342385724db9bf35547 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Tue, 26 Apr 2022 07:13:30 -0700 Subject: [PATCH 2/2] Update src/test/rustdoc/issue-95873.rs Co-authored-by: Guillaume Gomez --- src/test/rustdoc/issue-95873.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/rustdoc/issue-95873.rs b/src/test/rustdoc/issue-95873.rs index 1ed7e582275db..ff33fb63a0bab 100644 --- a/src/test/rustdoc/issue-95873.rs +++ b/src/test/rustdoc/issue-95873.rs @@ -1,2 +1,2 @@ -// @!has issue_95873/index.html '{{root}}' +// @has issue_95873/index.html "//*[@class='item-left import-item']" "pub use ::std as x;" pub use ::std as x;