mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #107242 - notriddle:notriddle/title-ordering, r=GuillaumeGomez

Browse Source 
rustdoc: make item links consistently use `title="{shortty} {path}"`

The ordering in item tables was flipped in 3030cbea95, making it inconsistent with the ordering in method signatures.

Compare these (before this PR is merged):

c8e6a9e8b6/src/librustdoc/html/render/print_item.rs (L455-L459)

c8e6a9e8b6/src/librustdoc/html/format.rs (L903-L908)
This commit is contained in:
Yuki Okushi 2023-01-27 12:57:55 +09:00 committed by GitHub
commit 145241402d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustdoc/html/render/print_item.rs
View File

@ -452,7 +452,7 @@ fn cmp(
stab = stab.unwrap_or_default(), stab = stab.unwrap_or_default(),
unsafety_flag = unsafety_flag, unsafety_flag = unsafety_flag,
href = item_path(myitem.type_(), myitem.name.unwrap().as_str()), href = item_path(myitem.type_(), myitem.name.unwrap().as_str()),
title = [full_path(cx, myitem), myitem.type_().to_string()] title = [myitem.type_().to_string(), full_path(cx, myitem)]
.iter() .iter()
.filter_map(|s| if !s.is_empty() { Some(s.as_str()) } else { None }) .filter_map(|s| if !s.is_empty() { Some(s.as_str()) } else { None })
.collect::<Vec<_>>() .collect::<Vec<_>>()

4
tests/rustdoc-gui/unsafe-fn.goml
View File

@ -4,8 +4,8 @@ goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
show-text: true show-text: true
compare-elements-property: ( compare-elements-property: (
"//a[@title='test_docs::safe_fn fn']/..", "//a[@title='fn test_docs::safe_fn']/..",
"//a[@title='test_docs::unsafe_fn fn']/..", "//a[@title='fn test_docs::unsafe_fn']/..",
["clientHeight"] ["clientHeight"]
) )

2
tests/rustdoc/issue-83375-multiple-mods-w-same-name-doc-inline-last-item.rs
View File

@ -11,6 +11,6 @@ pub mod prelude {
#[doc(inline)] #[doc(inline)]
pub use sub::*; pub use sub::*;
// @count foo/index.html '//a[@class="mod"][@title="foo::prelude mod"]' 1 // @count foo/index.html '//a[@class="mod"][@title="mod foo::prelude"]' 1
// @count foo/prelude/index.html '//div[@class="item-row"]' 0 // @count foo/prelude/index.html '//div[@class="item-row"]' 0
pub mod prelude {} pub mod prelude {}

2
tests/rustdoc/issue-83375-multiple-mods-w-same-name-doc-inline.rs
View File

@ -8,7 +8,7 @@ pub mod prelude {
} }
} }
// @count foo/index.html '//a[@class="mod"][@title="foo::prelude mod"]' 1 // @count foo/index.html '//a[@class="mod"][@title="mod foo::prelude"]' 1
// @count foo/prelude/index.html '//div[@class="item-row"]' 0 // @count foo/prelude/index.html '//div[@class="item-row"]' 0
pub mod prelude {} pub mod prelude {}

2
tests/rustdoc/issue-99221-multiple-structs-w-same-name.rs
View File

@ -9,6 +9,6 @@
pub use issue_99221_aux::*; pub use issue_99221_aux::*;
// @count foo/index.html '//a[@class="struct"][@title="foo::Print struct"]' 1 // @count foo/index.html '//a[@class="struct"][@title="struct foo::Print"]' 1
pub struct Print; pub struct Print;

2
tests/rustdoc/issue-99734-multiple-foreigns-w-same-name.rs
View File

@ -9,7 +9,7 @@
pub use issue_99734_aux::*; pub use issue_99734_aux::*;
// @count foo/index.html '//a[@class="fn"][@title="foo::main fn"]' 1 // @count foo/index.html '//a[@class="fn"][@title="fn foo::main"]' 1
extern "C" { extern "C" {
pub fn main() -> std::ffi::c_int; pub fn main() -> std::ffi::c_int;

2
tests/rustdoc/issue-99734-multiple-mods-w-same-name.rs
View File

@ -9,6 +9,6 @@
pub use issue_99734_aux::*; pub use issue_99734_aux::*;
// @count foo/index.html '//a[@class="mod"][@title="foo::task mod"]' 1 // @count foo/index.html '//a[@class="mod"][@title="mod foo::task"]' 1
pub mod task {} pub mod task {}