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

Fix attributes position in type declaration

Browse Source
This commit is contained in:
Guillaume Gomez 2019-04-10 22:31:42 +02:00
parent 2002b4b39a
commit 825a11ea3b
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3117,7 +3117,6 @@ fn item_trait(
// FIXME: we should be using a derived_id for the Anchors here // FIXME: we should be using a derived_id for the Anchors here
write!(w, "{{\n")?; write!(w, "{{\n")?;
for t in &types { for t in &types {
write!(w, " ")?;
render_assoc_item(w, t, AssocItemLink::Anchor(None), ItemType::Trait)?; render_assoc_item(w, t, AssocItemLink::Anchor(None), ItemType::Trait)?;
write!(w, ";\n")?; write!(w, ";\n")?;
} }
@ -3125,7 +3124,6 @@ fn item_trait(
w.write_str("\n")?; w.write_str("\n")?;
} }
for t in &consts { for t in &consts {
write!(w, " ")?;
render_assoc_item(w, t, AssocItemLink::Anchor(None), ItemType::Trait)?; render_assoc_item(w, t, AssocItemLink::Anchor(None), ItemType::Trait)?;
write!(w, ";\n")?; write!(w, ";\n")?;
} }
@ -3133,7 +3131,6 @@ fn item_trait(
w.write_str("\n")?; w.write_str("\n")?;
} }
for (pos, m) in required.iter().enumerate() { for (pos, m) in required.iter().enumerate() {
write!(w, " ")?;
render_assoc_item(w, m, AssocItemLink::Anchor(None), ItemType::Trait)?; render_assoc_item(w, m, AssocItemLink::Anchor(None), ItemType::Trait)?;
write!(w, ";\n")?; write!(w, ";\n")?;
@ -3145,7 +3142,6 @@ fn item_trait(
w.write_str("\n")?; w.write_str("\n")?;
} }
for (pos, m) in provided.iter().enumerate() { for (pos, m) in provided.iter().enumerate() {
write!(w, " ")?;
render_assoc_item(w, m, AssocItemLink::Anchor(None), ItemType::Trait)?; render_assoc_item(w, m, AssocItemLink::Anchor(None), ItemType::Trait)?;
match m.inner { match m.inner {
clean::MethodItem(ref inner) if !inner.generics.where_predicates.is_empty() => { clean::MethodItem(ref inner) if !inner.generics.where_predicates.is_empty() => {
@ -3454,8 +3450,9 @@ fn render_assoc_item(w: &mut fmt::Formatter<'_>,
(0, true) (0, true)
}; };
render_attributes(w, meth)?; render_attributes(w, meth)?;
write!(w, "{}{}{}{}{}{}fn <a href='{href}' class='fnname'>{name}</a>\ write!(w, "{}{}{}{}{}{}{}fn <a href='{href}' class='fnname'>{name}</a>\
{generics}{decl}{where_clause}", {generics}{decl}{where_clause}",
if parent == ItemType::Trait { " " } else { "" },
VisSpace(&meth.visibility), VisSpace(&meth.visibility),
ConstnessSpace(header.constness), ConstnessSpace(header.constness),
UnsafetySpace(header.unsafety), UnsafetySpace(header.unsafety),
@ -3755,7 +3752,7 @@ const ATTRIBUTE_WHITELIST: &'static [&'static str] = &[
"non_exhaustive" "non_exhaustive"
]; ];
fn render_attributes(w: &mut fmt::Formatter<'_>, it: &clean::Item) -> fmt::Result { fn render_attributes(w: &mut dyn fmt::Write, it: &clean::Item) -> fmt::Result {
let mut attrs = String::new(); let mut attrs = String::new();
for attr in &it.attrs.other_attrs { for attr in &it.attrs.other_attrs {

14
src/librustdoc/html/static/rustdoc.css
View File

@ -1577,3 +1577,17 @@ div.name.expand::before {
left: -15px; left: -15px;
top: 2px; top: 2px;
} }
/* This part is to fix the "Expand attributes" part in the type declaration. */
.type-decl > pre > :first-child {
margin-left: 0 !important;
}
.type-decl > pre > :nth-child(2) {
margin-left: 1.8em !important;
}
.type-decl > pre > .toggle-attributes {
margin-left: 2.2em;
}
.type-decl > pre > .docblock.attributes {
margin-left: 4em;
}