only abort after all early passes have run

diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 3e5f16817a8d033cb684c25b5a4dc0e9f344387e..86e5bbeab706a2dafa72c089270bd171ec9373df 100644 (file)
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -596,6 +596,8 @@ fn report_deprecated_attr(name: &str, diag: &errors::Handler) {
                 }
             }
 
+            ctxt.sess().abort_if_errors();
+
             (krate, ctxt.renderinfo.into_inner(), passes)
         }), &sess)
     })

diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index b76168f7b741b491c47980e90afb593ef40ad0f0..28d504c2ee0c8b259094dfcf29402476422d5599 100644 (file)
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -379,8 +379,6 @@ fn fold_item(&mut self, mut item: Item) -> Option<Item> {
             }
         }
 
-        cx.sess().abort_if_errors();
-
         if item.is_mod() && !item.attrs.inner_docs {
             self.mod_ids.push(item_node_id.unwrap());
         }