squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Collect links into a single vector

Browse source
This commit is contained in:
Dániel Buga 2020-12-31 10:26:24 +01:00
parent cb4317de00
commit 854b9d1727
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,7 @@ use rustc_session::lint;
use rustc_span::edition::Edition; use rustc_span::edition::Edition;
use rustc_span::Span; use rustc_span::Span;
use std::borrow::Cow; use std::borrow::Cow;
use std::cell::RefCell;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::default::Default; use std::default::Default;
use std::fmt::Write; use std::fmt::Write;
@ -1132,8 +1133,7 @@ crate fn markdown_links(md: &str) -> Vec<(String, Range<usize>)> {
return vec![]; return vec![];
} }
let mut links = vec![]; let links = RefCell::new(vec![]);
let mut shortcut_links = vec![];
let locate = |s: &str, fallback: Range<usize>| unsafe { let locate = |s: &str, fallback: Range<usize>| unsafe {
let s_start = s.as_ptr(); let s_start = s.as_ptr();
@ -1152,7 +1152,7 @@ crate fn markdown_links(md: &str) -> Vec<(String, Range<usize>)> {
let mut push = |link: BrokenLink<'_>| { let mut push = |link: BrokenLink<'_>| {
// FIXME: use `link.span` instead of `locate` // FIXME: use `link.span` instead of `locate`
// (doing it now includes the `[]` as well as the text) // (doing it now includes the `[]` as well as the text)
shortcut_links.push((link.reference.to_owned(), locate(link.reference, link.span))); links.borrow_mut().push((link.reference.to_owned(), locate(link.reference, link.span)));
None None
}; };
let p = Parser::new_with_broken_link_callback(md, opts(), Some(&mut push)).into_offset_iter(); let p = Parser::new_with_broken_link_callback(md, opts(), Some(&mut push)).into_offset_iter();
@ -1165,16 +1165,14 @@ crate fn markdown_links(md: &str) -> Vec<(String, Range<usize>)> {
for ev in iter { for ev in iter {
if let Event::Start(Tag::Link(_, dest, _)) = ev.0 { if let Event::Start(Tag::Link(_, dest, _)) = ev.0 {
debug!("found link: {}", dest); debug!("found link: {}", dest);
links.push(match dest { links.borrow_mut().push(match dest {
CowStr::Borrowed(s) => (s.to_owned(), locate(s, ev.1)), CowStr::Borrowed(s) => (s.to_owned(), locate(s, ev.1)),
s @ (CowStr::Boxed(..) | CowStr::Inlined(..)) => (s.into_string(), ev.1), s @ (CowStr::Boxed(..) | CowStr::Inlined(..)) => (s.into_string(), ev.1),
}); });
} }
} }
links.append(&mut shortcut_links); links.into_inner()
links
} }
#[derive(Debug)] #[derive(Debug)]