Skip to content

Commit dc591e1

Browse files
Accept !{} and ![] as macro disambiguators
1 parent 4cd5aff commit dc591e1

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/librustdoc/passes/collect_intra_doc_links.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -951,9 +951,9 @@ fn preprocess_link<'a>(
951951
}
952952

953953
// Parse and strip the disambiguator from the link, if present.
954-
let (link_text, path_str, disambiguator) = match Disambiguator::from_str(&link) {
955-
Ok(Some((d, path, link_text))) => (link_text.trim(), path.trim(), Some(d)),
956-
Ok(None) => (link.trim(), link.trim(), None),
954+
let (disambiguator, path_str, link_text) = match Disambiguator::from_str(&link) {
955+
Ok(Some((d, path, link_text))) => (Some(d), path.trim(), link_text.trim()),
956+
Ok(None) => (None, link.trim(), link.trim()),
957957
Err((err_msg, relative_range)) => {
958958
// Only report error if we would not have ignored this link. See issue #83859.
959959
if !should_ignore_link_with_disambiguators(link) {
@@ -1538,6 +1538,8 @@ impl Disambiguator {
15381538
} else {
15391539
let suffixes = [
15401540
("!()", DefKind::Macro(MacroKind::Bang)),
1541+
("!{}", DefKind::Macro(MacroKind::Bang)),
1542+
("![]", DefKind::Macro(MacroKind::Bang)),
15411543
("()", DefKind::Fn),
15421544
("!", DefKind::Macro(MacroKind::Bang)),
15431545
];

0 commit comments

Comments
 (0)