From 2ca6f11663709bcbc113d3dd223ae51442460e15 Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jyn514@gmail.com>
Date: Sat, 22 Aug 2020 00:50:26 -0400
Subject: [PATCH] Fix rebase conflicts

---
 src/librustdoc/passes/collect_intra_doc_links.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index 7bd4b8ca854b..43003c944918 100644
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -938,9 +938,9 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> {
                                 // We only looked in one namespace. Try to give a better error if possible.
                                 if kind.full_res().is_none() {
                                     let other_ns = if ns == ValueNS { TypeNS } else { ValueNS };
-                                    for &ns in &[other_ns, MacroNS] {
+                                    for &new_ns in &[other_ns, MacroNS] {
                                         if let Some(res) = self.check_full_res(
-                                            ns,
+                                            new_ns,
                                             path_str,
                                             base_node,
                                             &current_item,