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

Rollup merge of #120641 - klensy:copypaste-me, r=notriddle

Browse Source 
rustdoc: trait.impl, type.impl: sort impls to make it not depend on serialization order

Can be tested by running `cargo doc` with different rust versions on some crate and comparing `doc` folders: files in `trait.impl` and `type.impl` will sometimes have different order of impls.
This commit is contained in:
Matthias Krüger 2024-02-05 06:37:17 +01:00 committed by GitHub
commit a2d3eed58d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/librustdoc/html/render/write_shared.rs
View File

@ -593,11 +593,17 @@ else if (window.initSearch) window.initSearch(searchIndex);
ret
})
.collect::<Vec<_>>();
let impls = format!(
r#""{}":{}"#,
krate.name(cx.tcx()),
serde_json::to_string(&impls).expect("failed serde conversion"),
);
// FIXME: this fixes only rustdoc part of instability of trait impls
// for js files, see #120371
// Manually collect to string and sort to make list not depend on order
let mut impls = impls
.iter()
.map(|i| serde_json::to_string(i).expect("failed serde conversion"))
.collect::<Vec<_>>();
impls.sort();
let impls = format!(r#""{}":[{}]"#, krate.name(cx.tcx()), impls.join(","));
let mut mydst = dst.clone();
for part in &aliased_type.target_fqp[..aliased_type.target_fqp.len() - 1] {
@ -702,11 +708,16 @@ else if (window.initSearch) window.initSearch(searchIndex);
continue;
}
let implementors = format!(
r#""{}":{}"#,
krate.name(cx.tcx()),
serde_json::to_string(&implementors).expect("failed serde conversion"),
);
// FIXME: this fixes only rustdoc part of instability of trait impls
// for js files, see #120371
// Manually collect to string and sort to make list not depend on order
let mut implementors = implementors
.iter()
.map(|i| serde_json::to_string(i).expect("failed serde conversion"))
.collect::<Vec<_>>();
implementors.sort();
let implementors = format!(r#""{}":[{}]"#, krate.name(cx.tcx()), implementors.join(","));
let mut mydst = dst.clone();
for part in &remote_path[..remote_path.len() - 1] {