handle more edge cases

Author: lolbinarycat

compiler/rustc_resolve/src/rustdoc.rs

@@ -538,11 +538,20 @@ pub fn source_span_for_markdown_range(
         // doc fragments, but the target range does not span across multiple
         // fragments.
         let mut match_data = None;
+        let pat = &markdown[md_range.clone()];
+        // this heirustic doesn't make sense with a zero-sized range.
+        if pat.len() == 0 {
+            return None;
+        }
         for (i, fragment) in fragments.iter().enumerate() {
             if let Ok(snippet) = span_to_snippet(fragment.span)
-                && let Some(match_start) = snippet.find(&markdown[md_range.clone()])
+                && let Some(match_start) = snippet.find(pat)
             {
-                if match_data.is_none() {
+                // if there is either a match in a previous fragment,
+                // or multiple matches in this fragment,
+                // there is ambiguity.
+                if match_data.is_none() &&
+                    !snippet[match_start+1..].contains(pat) {
                     match_data = Some((i, match_start));
                 } else {
                     // heirustic produced ambiguity, return nothing.

src/librustdoc/passes/lint/unescaped_backticks.rs

@@ -48,7 +48,7 @@ pub(crate) fn visit_item(cx: &DocContext<'_>, item: &Item, hir_id: HirId, dox: &
                     &(backtick_index..backtick_index + 1),
                     &item.attrs.doc_strings,
                 )
-                .unwrap_or_else(|| item.attr_span(tcx));
+                    .unwrap_or_else(|| item.attr_span(tcx));
 
                 tcx.node_span_lint(crate::lint::UNESCAPED_BACKTICKS, hir_id, span, |lint| {
                     lint.primary_message("unescaped backtick");

tests/rustdoc-ui/unescaped_backticks.stderr

@@ -628,21 +628,21 @@ LL | /// or even to add a number `n` to 42 (`add(42, n)\`)!
    |                                                   +
 
 error: unescaped backtick
-  --> $DIR/unescaped_backticks.rs:108:9
+  --> $DIR/unescaped_backticks.rs:108:10
    |
 LL | #[doc = "`"]
-   |         ^^^
+   |          ^
    |
    = help: the opening or closing backtick of an inline code may be missing
    = help: if you meant to use a literal backtick, escape it
             change: `
            to this: \`
 
 error: unescaped backtick
-  --> $DIR/unescaped_backticks.rs:115:9
+  --> $DIR/unescaped_backticks.rs:115:26
    |
 LL | #[doc = concat!("\\", "`")]
-   |         ^^^^^^^^^^^^^^^^^^^^
+   |                          ^
    |
    = help: the opening backtick of an inline code may be missing
             change: \`