bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #71928 - mibac138:strikethrough, r=GuillaumeGomez

Browse source 
Add strikethrough support to rustdoc

Implements uncontroversial part of #71183.
r? @GuillaumeGomez
This commit is contained in:
Dylan DPC 2020-05-12 11:41:10 +02:00 • committed by GitHub
commit 5fe77e5997
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustdoc/html/markdown.rs
View file

@ -44,7 +44,7 @@ use pulldown_cmark::{html, CodeBlockKind, CowStr, Event, Options, Parser, Tag};
mod tests; mod tests;
fn opts() -> Options { fn opts() -> Options {
Options::ENABLE_TABLES | Options::ENABLE_FOOTNOTES Options::ENABLE_TABLES | Options::ENABLE_FOOTNOTES | Options::ENABLE_STRIKETHROUGH
} }
/// When `to_string` is called, this struct will emit the HTML corresponding to /// When `to_string` is called, this struct will emit the HTML corresponding to
@ -933,7 +933,11 @@ impl MarkdownSummaryLine<'_> {
} }
}; };
let p = Parser::new_with_broken_link_callback(md, Options::empty(), Some(&replacer)); let p = Parser::new_with_broken_link_callback(
md,
Options::ENABLE_STRIKETHROUGH,
Some(&replacer),
);
let mut s = String::new(); let mut s = String::new();
@ -975,7 +979,11 @@ pub fn plain_summary_line(md: &str) -> String {
} }
} }
let mut s = String::with_capacity(md.len() * 3 / 2); let mut s = String::with_capacity(md.len() * 3 / 2);
let p = ParserWrapper { inner: Parser::new(md), is_in: 0, is_first: true }; let p = ParserWrapper {
inner: Parser::new_ext(md, Options::ENABLE_STRIKETHROUGH),
is_in: 0,
is_first: true,
};
p.filter(|t| !t.is_empty()).for_each(|i| s.push_str(&i)); p.filter(|t| !t.is_empty()).for_each(|i| s.push_str(&i));
s s
} }

6
src/test/rustdoc/test-strikethrough.rs Normal file
View file

@ -0,0 +1,6 @@
#![crate_name = "foo"]
// @has foo/fn.f.html
// @has - //del "Y"
/// ~~Y~~
pub fn f() {}