Use Result<(), ErrorGuaranteed>

Author: estebank

compiler/rustc_ast/src/ast.rs

@@ -2872,7 +2872,7 @@ pub enum ModKind {
     /// or with definition outlined to a separate file `mod foo;` and already loaded from it.
     /// The inner span is from the first token past `{` to the last token until `}`,
     /// or from the first to the last token in the loaded file.
-    Loaded(ThinVec<P<Item>>, Inline, ModSpans, bool),
+    Loaded(ThinVec<P<Item>>, Inline, ModSpans, Result<(), ErrorGuaranteed>),
     /// Module with definition outlined to a separate file `mod foo;` but not yet loaded from it.
     Unloaded,
 }

compiler/rustc_ast_lowering/src/item.rs

@@ -90,7 +90,7 @@ impl<'a, 'hir> ItemLowerer<'a, 'hir> {
     fn lower_crate(&mut self, c: &Crate) {
         debug_assert_eq!(self.resolver.node_id_to_def_id[&CRATE_NODE_ID], CRATE_DEF_ID);
         self.with_lctx(CRATE_NODE_ID, |lctx| {
-            let module = lctx.lower_mod(&c.items, &c.spans, false);
+            let module = lctx.lower_mod(&c.items, &c.spans, Ok(()));
             lctx.lower_attrs(hir::CRATE_HIR_ID, &c.attrs);
             hir::OwnerNode::Crate(module)
         })
@@ -118,7 +118,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
         &mut self,
         items: &[P<Item>],
         spans: &ModSpans,
-        had_parse_errors: bool,
+        had_parse_errors: Result<(), ErrorGuaranteed>,
     ) -> &'hir hir::Mod<'hir> {
         self.arena.alloc(hir::Mod {
             spans: hir::ModSpans {

compiler/rustc_expand/src/module.rs

@@ -37,7 +37,7 @@ pub(crate) struct ParsedExternalMod {
     pub file_path: PathBuf,
     pub dir_path: PathBuf,
     pub dir_ownership: DirOwnership,
-    pub had_parse_error: bool,
+    pub had_parse_error: Result<(), ErrorGuaranteed>,
 }
 
 pub enum ModError<'a> {
@@ -75,11 +75,12 @@ pub(crate) fn parse_external_mod(
         attrs.extend(inner_attrs);
         (items, inner_span, mp.file_path)
     };
-    let had_parse_error = result.is_err();
 
     // (1) ...instead, we return a dummy module.
-    let (items, spans, file_path) =
-        result.map_err(|err| err.report(sess, span)).unwrap_or_default();
+    let ((items, spans, file_path), had_parse_error) = match result {
+        Err(err) => (Default::default(), Err(err.report(sess, span))),
+        Ok(result) => (result, Ok(())),
+    };
 
     // Extract the directory path for submodules of the module.
     let dir_path = file_path.parent().unwrap_or(&file_path).to_owned();

compiler/rustc_hir/src/hir.rs

@@ -3075,7 +3075,7 @@ pub enum ClosureBinder {
 pub struct Mod<'hir> {
     pub spans: ModSpans,
     pub item_ids: &'hir [ItemId],
-    pub had_parse_errors: bool,
+    pub had_parse_errors: Result<(), ErrorGuaranteed>,
 }
 
 #[derive(Copy, Clone, Debug, HashStable_Generic)]

compiler/rustc_parse/src/parser/item.rs

@@ -45,7 +45,7 @@ impl<'a> Parser<'a> {
             let (inner_attrs, items, inner_span) =
                 self.parse_mod(&token::CloseDelim(Delimiter::Brace))?;
             attrs.extend(inner_attrs);
-            ModKind::Loaded(items, Inline::Yes, inner_span, false)
+            ModKind::Loaded(items, Inline::Yes, inner_span, Ok(()))
         };
         Ok((id, ItemKind::Mod(safety, mod_kind)))
     }

compiler/rustc_resolve/src/build_reduced_graph.rs

@@ -781,7 +781,7 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
                 );
                 self.r.define(parent, ident, TypeNS, (module, vis, sp, expansion));
 
-                if let ast::ModKind::Loaded(_, _, _, true) = mod_kind {
+                if let ast::ModKind::Loaded(_, _, _, Err(_)) = mod_kind {
                     self.r.mod_with_parse_errors.insert(def_id);
                 }