diff --git a/compiler/rustc_resolve/src/build_reduced_graph.rs b/compiler/rustc_resolve/src/build_reduced_graph.rs index 4b6d1a2ebfc9..924b8afa329f 100644 --- a/compiler/rustc_resolve/src/build_reduced_graph.rs +++ b/compiler/rustc_resolve/src/build_reduced_graph.rs @@ -782,7 +782,7 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> { self.r.define(parent, ident, TypeNS, (module, vis, sp, expansion)); if let ast::ModKind::Loaded(_, _, _, Err(_)) = mod_kind { - self.r.mod_with_parse_errors.insert(def_id); + self.r.mods_with_parse_errors.insert(def_id); } // Descend into the module. diff --git a/compiler/rustc_resolve/src/ident.rs b/compiler/rustc_resolve/src/ident.rs index 359f69ff6ea9..5906a682f3e1 100644 --- a/compiler/rustc_resolve/src/ident.rs +++ b/compiler/rustc_resolve/src/ident.rs @@ -1602,7 +1602,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { let maybe_assoc = opt_ns != Some(MacroNS) && PathSource::Type.is_expected(res); if let Some(next_module) = binding.module() { - if self.mod_with_parse_errors.contains(&next_module.def_id()) { + if self.mods_with_parse_errors.contains(&next_module.def_id()) { module_had_parse_errors = true; } module = Some(ModuleOrUniformRoot::Module(next_module)); diff --git a/compiler/rustc_resolve/src/imports.rs b/compiler/rustc_resolve/src/imports.rs index 1c4862f93f06..2ed3f4d2c4fb 100644 --- a/compiler/rustc_resolve/src/imports.rs +++ b/compiler/rustc_resolve/src/imports.rs @@ -675,7 +675,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { ) { errors.retain(|(_import, err)| match err.module { // Skip `use` errors for `use foo::Bar;` if `foo.rs` has unrecovered parse errors. - Some(def_id) if self.mod_with_parse_errors.contains(&def_id) => false, + Some(def_id) if self.mods_with_parse_errors.contains(&def_id) => false, _ => true, }); if errors.is_empty() { diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs index fd4c05375f1e..94adfcd3b915 100644 --- a/compiler/rustc_resolve/src/lib.rs +++ b/compiler/rustc_resolve/src/lib.rs @@ -1202,7 +1202,7 @@ pub struct Resolver<'ra, 'tcx> { /// could be a crate that wasn't imported. For diagnostics use only. current_crate_outer_attr_insert_span: Span, - mod_with_parse_errors: FxHashSet, + mods_with_parse_errors: FxHashSet, } /// This provides memory for the rest of the crate. The `'ra` lifetime that is @@ -1548,7 +1548,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { impl_unexpanded_invocations: Default::default(), impl_binding_keys: Default::default(), current_crate_outer_attr_insert_span, - mod_with_parse_errors: Default::default(), + mods_with_parse_errors: Default::default(), }; let root_parent_scope = ParentScope::module(graph_root, &resolver);