From 9ca3ff16ad14e187b970ac1714b9e050ccbbf825 Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Sun, 13 Mar 2016 10:31:40 +0000 Subject: [PATCH] Fixes #32222 --- src/librustc_resolve/resolve_imports.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs index 89586db32bc..31524b9a12a 100644 --- a/src/librustc_resolve/resolve_imports.rs +++ b/src/librustc_resolve/resolve_imports.rs @@ -276,12 +276,6 @@ impl<'a> ::ModuleS<'a> { .increment_outstanding_references(is_public); } - fn decrement_outstanding_references_for(&self, name: Name, ns: Namespace, is_public: bool) { - self.update_resolution(name, ns, |resolution| { - resolution.decrement_outstanding_references(is_public); - }) - } - // Use `update` to mutate the resolution for the name. // If the resolution becomes a success, define it in the module's glob importers. fn update_resolution(&self, name: Name, ns: Namespace, update: F) -> T @@ -485,7 +479,8 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> { // Temporarily count the directive as determined so that the resolution fails // (as opposed to being indeterminate) when it can only be defined by the directive. if !determined { - module_.decrement_outstanding_references_for(target, ns, directive.is_public) + module_.resolutions.borrow_mut().get_mut(&(target, ns)).unwrap() + .decrement_outstanding_references(directive.is_public); } let result = self.resolver.resolve_name_in_module(target_module, source, ns, false, true); @@ -522,7 +517,10 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> { self.report_conflict(target, ns, &directive.import(binding, None), old_binding); } } - module_.decrement_outstanding_references_for(target, ns, directive.is_public); + + module_.update_resolution(target, ns, |resolution| { + resolution.decrement_outstanding_references(directive.is_public); + }) } match (&value_result, &type_result) {