Skip to content

Commit e814f75

Browse files
authored
Rollup merge of rust-lang#45421 - QuietMisdreavus:update-pulldown, r=steveklabnik
rustdoc: update pulldown + fix spurious rendering difference around footnotes fixes rust-lang#45420
2 parents 0aad849 + af09ba8 commit e814f75

File tree

3 files changed

+5
-20
lines changed

3 files changed

+5
-20
lines changed

src/Cargo.lock

+1-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/librustdoc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ doctest = false
1313
[dependencies]
1414
env_logger = { version = "0.4", default-features = false }
1515
log = "0.3"
16-
pulldown-cmark = { version = "0.0.14", default-features = false }
16+
pulldown-cmark = { version = "0.1.0", default-features = false }
1717
html-diff = "0.0.4"
1818

1919
[build-dependencies]

src/librustdoc/html/markdown.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ impl<'a, I: Iterator<Item = Event<'a>>> Iterator for Footnotes<'a, I> {
371371
match self.inner.next() {
372372
Some(Event::FootnoteReference(ref reference)) => {
373373
let entry = self.get_entry(&reference);
374-
let reference = format!("<sup id=\"supref{0}\"><a href=\"#ref{0}\">{0}\
374+
let reference = format!("<sup id=\"fnref{0}\"><a href=\"#fn{0}\">{0}\
375375
</a></sup>",
376376
(*entry).1);
377377
return Some(Event::Html(reference.into()));
@@ -394,15 +394,15 @@ impl<'a, I: Iterator<Item = Event<'a>>> Iterator for Footnotes<'a, I> {
394394
v.sort_by(|a, b| a.1.cmp(&b.1));
395395
let mut ret = String::from("<div class=\"footnotes\"><hr><ol>");
396396
for (mut content, id) in v {
397-
write!(ret, "<li id=\"ref{}\">", id).unwrap();
397+
write!(ret, "<li id=\"fn{}\">", id).unwrap();
398398
let mut is_paragraph = false;
399399
if let Some(&Event::End(Tag::Paragraph)) = content.last() {
400400
content.pop();
401401
is_paragraph = true;
402402
}
403403
html::push_html(&mut ret, content.into_iter());
404404
write!(ret,
405-
"&nbsp;<a href=\"#supref{}\" rev=\"footnote\">↩</a>",
405+
"&nbsp;<a href=\"#fnref{}\" rev=\"footnote\">↩</a>",
406406
id).unwrap();
407407
if is_paragraph {
408408
ret.push_str("</p>");

0 commit comments

Comments
 (0)