about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoshua Nelson <jyn514@gmail.com>2020-08-21 15:19:47 -0400
committerJoshua Nelson <jyn514@gmail.com>2020-09-05 13:48:19 -0400
commitebc8cb470fd137214911fa317ff6b06c6683ad3c (patch)
tree6e2ea75058e91028e0ac9b90d0bc7ba11d5895c2
parent19d100278d9609c389780e2692dddaeb45fba301 (diff)
downloadrust-ebc8cb470fd137214911fa317ff6b06c6683ad3c.tar.gz
rust-ebc8cb470fd137214911fa317ff6b06c6683ad3c.zip
Turn NoParentItem from a panic into an ICE
-rw-r--r--src/librustdoc/passes/collect_intra_doc_links.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index 9a88c8eb42a..a859d1b2f5f 100644
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -541,7 +541,6 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
             })
         } else {
             debug!("attempting to resolve item without parent module: {}", path_str);
-            // TODO: maybe this should just be an ICE?
             Err(ErrorKind::Resolve(ResolutionFailure::NoParentItem))
         }
     }
@@ -1462,7 +1461,8 @@ fn resolution_failure(
                         }
                     }
                     ResolutionFailure::NoParentItem => {
-                        panic!("all intra doc links should have a parent item")
+                        diag.level = rustc_errors::Level::Bug;
+                        diag.note("all intra doc links should have a parent item");
                     }
                     ResolutionFailure::NoPrimitiveImpl(res, _) => {
                         let note = format!(
@@ -1694,7 +1694,6 @@ fn handle_variant(
     let parent = if let Some(parent) = cx.tcx.parent(res.def_id()) {
         parent
     } else {
-        // TODO: this should just be an unwrap, there should never be `Variant`s without a parent
         return Err(ErrorKind::Resolve(ResolutionFailure::NoParentItem));
     };
     let parent_def = Res::Def(DefKind::Enum, parent);