Skip to content

Commit 22dad4b

Browse files
Improve attributes display and allow expansion
1 parent a96247b commit 22dad4b

File tree

3 files changed

+384
-373
lines changed

3 files changed

+384
-373
lines changed

src/librustdoc/html/render.rs

+9-8
Original file line numberDiff line numberDiff line change
@@ -2513,15 +2513,16 @@ fn render_attribute(attr: &clean::Attribute, recurse: bool) -> Option<String> {
25132513
Some(format!("{} = \"{}\"", k, v))
25142514
}
25152515
clean::List(ref k, ref values) if attribute_with_values(&*k) => {
2516-
let mut display = Vec::new();
2516+
let display: Vec<_> = values.iter()
2517+
.filter_map(|value| render_attribute(value, true))
2518+
.map(|entry| format!("{}", entry))
2519+
.collect();
25172520

2518-
for value in values {
2519-
let s = render_attribute(value, true);
2520-
if s.len() > 0 {
2521-
display.push(format!("{}", s));
2522-
}
2521+
if display.len() > 0 {
2522+
Some(format!("{}({})", k, display.join(", ")))
2523+
} else {
2524+
None
25232525
}
2524-
Some(format!("{}({})", k, display.join(", ")))
25252526
}
25262527
_ => {
25272528
None
@@ -2538,7 +2539,7 @@ fn render_attributes(w: &mut fmt::Formatter, it: &clean::Item) -> fmt::Result {
25382539
}
25392540
}
25402541
if attrs.len() > 0 {
2541-
write!(w, "<div class=\"docblock\">{}</div>", &attrs)?;
2542+
write!(w, "<div class=\"docblock attributes\">{}</div>", &attrs)?;
25422543
}
25432544
Ok(())
25442545
}

src/librustdoc/html/static/main.js

+2
Original file line numberDiff line numberDiff line change
@@ -1005,6 +1005,8 @@
10051005
.html('&nbsp;Expand&nbsp;description'));
10061006
var wrapper = $("<div class='toggle-wrapper'>").append(mainToggle);
10071007
$("#main > .docblock").before(wrapper);
1008+
var wrapper = $("<div class='toggle-wrapper toggle-attributes'>").append(mainToggle);
1009+
$("#main > pre > .docblock").before(wrapper);
10081010
});
10091011

10101012
$('pre.line-numbers').on('click', 'span', function() {

0 commit comments

Comments
 (0)