bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Correctly handle if a link starts with a whitespace

Browse source
This commit is contained in:
Guillaume Gomez 2023-02-16 18:33:14 +01:00
parent 9a7cc6c32f
commit fd62036caa
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_resolve/src/rustdoc.rs
View file

@ -340,6 +340,7 @@ pub fn inner_docs(attrs: &[ast::Attribute]) -> bool {
fn preprocess_link(link: &str) -> String { fn preprocess_link(link: &str) -> String {
let link = link.replace('`', ""); let link = link.replace('`', "");
let link = link.split('#').next().unwrap(); let link = link.split('#').next().unwrap();
let link = link.trim();
let link = link.rsplit('@').next().unwrap(); let link = link.rsplit('@').next().unwrap();
let link = link.strip_suffix("()").unwrap_or(link); let link = link.strip_suffix("()").unwrap_or(link);
let link = link.strip_suffix("{}").unwrap_or(link); let link = link.strip_suffix("{}").unwrap_or(link);

5
src/librustdoc/passes/collect_intra_doc_links.rs
View file

@ -884,7 +884,8 @@ fn preprocess_link(
let mut parts = stripped.split('#'); let mut parts = stripped.split('#');
let link = parts.next().unwrap(); let link = parts.next().unwrap();
if link.trim().is_empty() { let link = link.trim();
if link.is_empty() {
// This is an anchor to an element of the current page, nothing to do in here! // This is an anchor to an element of the current page, nothing to do in here!
return None; return None;
} }
@ -897,7 +898,7 @@ fn preprocess_link(
// Parse and strip the disambiguator from the link, if present. // Parse and strip the disambiguator from the link, if present.
let (disambiguator, path_str, link_text) = match Disambiguator::from_str(link) { let (disambiguator, path_str, link_text) = match Disambiguator::from_str(link) {
Ok(Some((d, path, link_text))) => (Some(d), path.trim(), link_text.trim()), Ok(Some((d, path, link_text))) => (Some(d), path.trim(), link_text.trim()),
Ok(None) => (None, link.trim(), link.trim()), Ok(None) => (None, link, link),
Err((err_msg, relative_range)) => { Err((err_msg, relative_range)) => {
// Only report error if we would not have ignored this link. See issue #83859. // Only report error if we would not have ignored this link. See issue #83859.
if !should_ignore_link_with_disambiguators(link) { if !should_ignore_link_with_disambiguators(link) {