From f68cc68e798edfb1f5cc1913e97b34b10ee8791f Mon Sep 17 00:00:00 2001
From: Eric Arellano <ericarellano@me.com>
Date: Mon, 7 Dec 2020 15:07:24 -0700
Subject: [PATCH] Review feedback for collect_intra_doc_links.rs

* Add assertion value is defined.
* Simplify comment.
* Fix bad change in err message.
---
 src/librustdoc/passes/collect_intra_doc_links.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index fdbab74be50..5ce64c4cd83 100644
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -435,8 +435,9 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
 
         // Try looking for methods and associated items.
         let mut split = path_str.rsplitn(2, "::");
-        // NB: the `splitn`'s first element is always defined, even if the delimiter is not present.
+        // NB: `split`'s first element is always defined, even if the delimiter was not present.
         let item_str = split.next().unwrap();
+        assert!(!item_str.is_empty());
         let item_name = Symbol::intern(item_str);
         let path_root = split
             .next()
@@ -448,7 +449,7 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
                 ResolutionFailure::NotResolved {
                     module_id,
                     partial_res: None,
-                    unresolved: path_str.into(),
+                    unresolved: item_str.into(),
                 }
             })?;