Rollup merge of #82962 - notriddle:cleanup-index, r=jyn514
Treat header as first paragraph for shortened markdown descriptions "The Rust Standard LibraryThe Rust Standard Library is the …" is an awful description.
This commit is contained in:
commit
5c62a182a1
|
@ -1093,6 +1093,7 @@ fn markdown_summary_with_limit(md: &str, length_limit: usize) -> (String, bool)
|
||||||
Tag::Emphasis => s.push_str("</em>"),
|
Tag::Emphasis => s.push_str("</em>"),
|
||||||
Tag::Strong => s.push_str("</strong>"),
|
Tag::Strong => s.push_str("</strong>"),
|
||||||
Tag::Paragraph => break,
|
Tag::Paragraph => break,
|
||||||
|
Tag::Heading(..) => break,
|
||||||
_ => {}
|
_ => {}
|
||||||
},
|
},
|
||||||
Event::HardBreak | Event::SoftBreak => {
|
Event::HardBreak | Event::SoftBreak => {
|
||||||
|
|
|
@ -235,6 +235,7 @@ fn test_short_markdown_summary() {
|
||||||
t("code `let x = i32;` ...", "code <code>let x = i32;</code> …");
|
t("code `let x = i32;` ...", "code <code>let x = i32;</code> …");
|
||||||
t("type `Type<'static>` ...", "type <code>Type<'static></code> …");
|
t("type `Type<'static>` ...", "type <code>Type<'static></code> …");
|
||||||
t("# top header", "top header");
|
t("# top header", "top header");
|
||||||
|
t("# top header\n\nfollowed by a paragraph", "top header");
|
||||||
t("## header", "header");
|
t("## header", "header");
|
||||||
t("first paragraph\n\nsecond paragraph", "first paragraph");
|
t("first paragraph\n\nsecond paragraph", "first paragraph");
|
||||||
t("```\nfn main() {}\n```", "");
|
t("```\nfn main() {}\n```", "");
|
||||||
|
|
|
@ -286,11 +286,7 @@ impl Serialize for TypeWithKind {
|
||||||
where
|
where
|
||||||
S: Serializer,
|
S: Serializer,
|
||||||
{
|
{
|
||||||
let mut seq = serializer.serialize_seq(None)?;
|
(&self.ty.name, ItemType::from(self.kind)).serialize(serializer)
|
||||||
seq.serialize_element(&self.ty.name)?;
|
|
||||||
let x: ItemType = self.kind.into();
|
|
||||||
seq.serialize_element(&x)?;
|
|
||||||
seq.end()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue