Improve attributes display and allow expansion

rust-lang · Nov 6, 2016 · 22dad4b · 22dad4b
1 parent a96247b
commit 22dad4b
Show file tree

Hide file tree

Showing 3 changed files with 384 additions and 373 deletions.
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
@@ -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(())
 }

diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
@@ -1005,6 +1005,8 @@
                     .html('&nbsp;Expand&nbsp;description'));
         var wrapper = $("<div class='toggle-wrapper'>").append(mainToggle);
         $("#main > .docblock").before(wrapper);
+        var wrapper = $("<div class='toggle-wrapper toggle-attributes'>").append(mainToggle);
+        $("#main > pre > .docblock").before(wrapper);
     });
 
     $('pre.line-numbers').on('click', 'span', function() {