OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sort auto trait and blanket implementations display

This commit is contained in:
Guillaume Gomez 2019-12-08 13:56:26 +01:00
parent d0126e8ed3
commit 9e3e421ab3
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/librustdoc/html/format.rs
View File

@ -63,6 +63,13 @@ impl Buffer {
}
}
crate fn new() -> Buffer {
Buffer {
for_html: false,
buffer: String::new(),
}
}
crate fn is_empty(&self) -> bool {
self.buffer.is_empty()
}
@ -106,6 +113,10 @@ impl Buffer {
write!(self, "{:#}", t);
}
}
crate fn is_for_html(&self) -> bool {
self.for_html
}
}
/// Wrapper struct for properly emitting a function or method declaration.

23
src/librustdoc/html/render.rs
View File

@ -2282,12 +2282,23 @@ fn render_implementor(cx: &Context, implementor: &Impl, w: &mut Buffer,
fn render_impls(cx: &Context, w: &mut Buffer,
traits: &[&&Impl],
containing_item: &clean::Item) {
for i in traits {
let did = i.trait_did().unwrap();
let assoc_link = AssocItemLink::GotoSource(did, &i.inner_impl().provided_trait_methods);
render_impl(w, cx, i, assoc_link,
RenderMode::Normal, containing_item.stable_since(), true, None, false, true);
}
let mut impls = traits.iter()
.map(|i| {
let did = i.trait_did().unwrap();
let assoc_link = AssocItemLink::GotoSource(did, &i.inner_impl().provided_trait_methods);
let mut buffer = if w.is_for_html() {
Buffer::html()
} else {
Buffer::new()
};
render_impl(&mut buffer, cx, i, assoc_link,
RenderMode::Normal, containing_item.stable_since(),
true, None, false, true);
buffer.into_inner()
})
.collect::<Vec<_>>();
impls.sort();
w.write_str(&impls.join(""));
}
fn bounds(t_bounds: &[clean::GenericBound], trait_alias: bool) -> String {