bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Improve attributes display and allow expansion

Browse source
This commit is contained in:
Guillaume Gomez 2016-11-06 21:03:08 +01:00
parent a96247bcac
commit 22dad4b044
3 changed files with 373 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/librustdoc/html/render.rs
View file

@ -2513,15 +2513,16 @@ fn render_attribute(attr: &clean::Attribute, recurse: bool) -> Option<String> {
Some(format!("{} = \"{}\"", k, v))
}
clean::List(ref k, ref values) if attribute_with_values(&*k) => {
let mut display = Vec::new();
let display: Vec<_> = values.iter()
.filter_map(|value| render_attribute(value, true))
.map(|entry| format!("{}", entry))
.collect();
for value in values {
let s = render_attribute(value, true);
if s.len() > 0 {
display.push(format!("{}", s));
}
if display.len() > 0 {
Some(format!("{}({})", k, display.join(", ")))
} else {
None
}
Some(format!("{}({})", k, display.join(", ")))
}
_ => {
None
@ -2538,7 +2539,7 @@ fn render_attributes(w: &mut fmt::Formatter, it: &clean::Item) -> fmt::Result {
}
}
if attrs.len() > 0 {
write!(w, "<div class=\"docblock\">{}</div>", &attrs)?;
write!(w, "<div class=\"docblock attributes\">{}</div>", &attrs)?;
}
Ok(())
}