Fix handling of footnote reference in footnote definition

Author: GuillaumeGomez

src/librustdoc/html/markdown/footnotes.rs

@@ -1,7 +1,7 @@
 //! Markdown footnote handling.
 use std::fmt::Writeas _;
 
-use pulldown_cmark::{Event,Tag,TagEnd, html};
+use pulldown_cmark::{CowStr,Event,Tag,TagEnd, html};
 use rustc_data_structures::fx::FxIndexMap;
 
 usesuper::SpannedEvent;
@@ -21,7 +21,7 @@ struct FootnoteDef<'a> {
 id:usize,
 }
 
-impl<'a,'b,I>Footnotes<'a,'b,I>{
+impl<'a,'b,I:Iterator<Item = SpannedEvent<'a>>>Footnotes<'a,'b,I>{
 pub(super)fnnew(iter:I,existing_footnotes:&'bmutusize) -> Self{
 Footnotes{inner: iter,footnotes:FxIndexMap::default(), existing_footnotes }
 }
@@ -34,31 +34,50 @@ impl<'a, 'b, I> Footnotes<'a, 'b, I> {
 // Don't allow changing the ID of existing entrys, but allow changing the contents.
 (content,*id)
 }
+
+fnhandle_footnote_reference(&mutself,reference:&CowStr<'a>) -> Event<'a>{
+// When we see a reference (to a footnote we may not know) the definition of,
+// reserve a number for it, and emit a link to that number.
+let(_, id) = self.get_entry(reference);
+let reference = format!(
+"<sup id=\"fnref{0}\"><a href=\"#fn{0}\">{1}</a></sup>",
+ id,
+// Although the ID count is for the whole page, the footnote reference
+// are local to the item so we make this ID "local" when displayed.
+ id - *self.existing_footnotes
+);
+Event::Html(reference.into())
+}
+
+fncollect_footnote_def(&mutself) -> Vec<Event<'a>>{
+letmut content = Vec::new();
+whileletSome((event, _)) = self.inner.next(){
+match event {
+Event::End(TagEnd::FootnoteDefinition) => break,
+Event::FootnoteReference(ref reference) => {
+ content.push(self.handle_footnote_reference(reference));
+}
+ event => content.push(event),
+}
+}
+ content
+}
 }
 
 impl<'a,'b,I:Iterator<Item = SpannedEvent<'a>>>IteratorforFootnotes<'a,'b,I>{
 typeItem = SpannedEvent<'a>;
 
 fnnext(&mutself) -> Option<Self::Item>{
 loop{
-matchself.inner.next(){
+let next = self.inner.next();
+match next {
 Some((Event::FootnoteReference(ref reference), range)) => {
-// When we see a reference (to a footnote we may not know) the definition of,
-// reserve a number for it, and emit a link to that number.
-let(_, id) = self.get_entry(reference);
-let reference = format!(
-"<sup id=\"fnref{0}\"><a href=\"#fn{0}\">{1}</a></sup>",
- id,
-// Although the ID count is for the whole page, the footnote reference
-// are local to the item so we make this ID "local" when displayed.
- id - *self.existing_footnotes
-);
-returnSome((Event::Html(reference.into()), range));
+returnSome((self.handle_footnote_reference(reference), range));
 }
 Some((Event::Start(Tag::FootnoteDefinition(def)), _)) => {
 // When we see a footnote definition, collect the assocated content, and store
 // that for rendering later.
-let content = collect_footnote_def(&mutself.inner);
+let content = self.collect_footnote_def();
 let(entry_content, _) = self.get_entry(&def);
 *entry_content = content;
 }
@@ -80,17 +99,6 @@ impl<'a, 'b, I: Iterator<Item = SpannedEvent<'a>>> Iterator for Footnotes<'a, 'b
 }
 }
 
-fncollect_footnote_def<'a>(events:implIterator<Item = SpannedEvent<'a>>) -> Vec<Event<'a>>{
-letmut content = Vec::new();
-for(event, _)in events {
-ifletEvent::End(TagEnd::FootnoteDefinition) = event {
-break;
-}
- content.push(event);
-}
- content
-}
-
 fnrender_footnotes_defs(mutfootnotes:Vec<FootnoteDef<'_>>) -> String{
 letmut ret = String::from("<div class=\"footnotes\"><hr><ol>");