Skip to content

Commit ac73317

Browse files
Report glob errors in first phase of commit.
1 parent 8499dd2 commit ac73317

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

compiler/rustc_resolve/src/imports.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -607,11 +607,14 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
607607
let SideEffect { imported_module, .. } = side_effect;
608608
import.imported_module.set(Some(*imported_module));
609609

610-
if import.is_glob()
611-
&& let ModuleOrUniformRoot::Module(module) = imported_module
612-
&& import.parent_scope.module != *module
613-
{
614-
module.glob_importers.borrow_mut().push(*import);
610+
if import.is_glob() {
611+
let ModuleOrUniformRoot::Module(module) = imported_module else {
612+
self.dcx().emit_err(CannotGlobImportAllCrates { span: import.span });
613+
continue;
614+
};
615+
if import.parent_scope.module != *module {
616+
module.glob_importers.borrow_mut().push(*import);
617+
}
615618
}
616619
}
617620

@@ -662,7 +665,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
662665
}
663666
(ImportKind::Glob { id, .. }, SideEffectBindings::Glob { import_bindings }) => {
664667
let ModuleOrUniformRoot::Module(module) = imported_module else {
665-
self.dcx().emit_err(CannotGlobImportAllCrates { span: import.span });
666668
continue;
667669
};
668670

0 commit comments

Comments
 (0)