rustdoc: Don't add extra newlines for fully opaque structs
Changes the definition for opaque structs to look like `pub struct Vec<T>
{ /* fields omitted */ }` to save space on the page.
Also only use one line for empty braced structs.
This commit is contained in:
@@ -2509,19 +2509,28 @@ fn render_struct(w: &mut fmt::Formatter, it: &clean::Item,
|
|||||||
if let Some(g) = g {
|
if let Some(g) = g {
|
||||||
write!(w, "{}", WhereClause(g))?
|
write!(w, "{}", WhereClause(g))?
|
||||||
}
|
}
|
||||||
write!(w, " {{\n{}", tab)?;
|
let mut has_visible_fields = false;
|
||||||
|
write!(w, " {{")?;
|
||||||
for field in fields {
|
for field in fields {
|
||||||
if let clean::StructFieldItem(ref ty) = field.inner {
|
if let clean::StructFieldItem(ref ty) = field.inner {
|
||||||
write!(w, " {}{}: {},\n{}",
|
write!(w, "\n{} {}{}: {},",
|
||||||
|
tab,
|
||||||
VisSpace(&field.visibility),
|
VisSpace(&field.visibility),
|
||||||
field.name.as_ref().unwrap(),
|
field.name.as_ref().unwrap(),
|
||||||
*ty,
|
*ty)?;
|
||||||
tab)?;
|
has_visible_fields = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if has_visible_fields {
|
||||||
if it.has_stripped_fields().unwrap() {
|
if it.has_stripped_fields().unwrap() {
|
||||||
write!(w, " // some fields omitted\n{}", tab)?;
|
write!(w, "\n{} // some fields omitted", tab)?;
|
||||||
|
}
|
||||||
|
write!(w, "\n{}", tab)?;
|
||||||
|
} else if it.has_stripped_fields().unwrap() {
|
||||||
|
// If there are no visible fields we can just display
|
||||||
|
// `{ /* fields omitted */ }` to save space.
|
||||||
|
write!(w, " /* fields omitted */ ")?;
|
||||||
}
|
}
|
||||||
write!(w, "}}")?;
|
write!(w, "}}")?;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,3 +48,13 @@ pub enum Qux {
|
|||||||
// @has - //pre "// some fields omitted"
|
// @has - //pre "// some fields omitted"
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @has structfields/struct.Baz.html //pre "pub struct Baz { /* fields omitted */ }"
|
||||||
|
pub struct Baz {
|
||||||
|
x: u8,
|
||||||
|
#[doc(hidden)]
|
||||||
|
pub y: u8,
|
||||||
|
}
|
||||||
|
|
||||||
|
// @has structfields/struct.Quux.html //pre "pub struct Quux {}"
|
||||||
|
pub struct Quux {}
|
||||||
|
|||||||
Reference in New Issue
Block a user