resolve: Refactor away `DeterminacyExt`

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 84ce0892b6b4f79aa710800ed6af75cf6e746bc1..a9044b90b00b59728fe40e9f8578eafc43af1087 100644 (file)
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -97,19 +97,9 @@ fn is_known_tool(name: Name) -> bool {
     ["clippy", "rustfmt"].contains(&&*name.as_str())
 }
 
-enum DeterminacyExt {
-    Determined,
-    Undetermined,
-    WeakUndetermined,
-}
-
-impl DeterminacyExt {
-    fn to_determinacy(self) -> Determinacy {
-        match self {
-            DeterminacyExt::Determined => Determined,
-            DeterminacyExt::Undetermined | DeterminacyExt::WeakUndetermined => Undetermined,
-        }
-    }
+enum Weak {
+    Yes,
+    No,
 }
 
 /// A free importable items suggested in case of resolution failure.
@@ -2223,7 +2213,7 @@ fn resolve_ident_in_module(
         }
         let result = self.resolve_ident_in_module_unadjusted_ext(
             module, ident, ns, parent_scope, false, record_used, path_span,
-        ).map_err(DeterminacyExt::to_determinacy);
+        ).map_err(|(determinacy, _)| determinacy);
         self.current_module = orig_current_module;
         result
     }

diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs
index 98dcd2988d6356e266c3526f6d1b68faa1b209b7..0ea0ff16347ffb95192006f62152b0be4d696d4e 100644 (file)
--- a/src/librustc_resolve/macros.rs
+++ b/src/librustc_resolve/macros.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use {AmbiguityError, AmbiguityKind, AmbiguityErrorMisc};
-use {CrateLint, DeterminacyExt, Resolver, ResolutionError};
+use {CrateLint, Resolver, ResolutionError, Weak};
 use {Module, ModuleKind, NameBinding, NameBindingKind, PathResult, ToNameBinding};
 use {is_known_tool, names_to_string, resolve_error};
 use ModuleOrUniformRoot;
@@ -688,10 +688,11 @@ struct Flags: u8 {
                             };
                             Ok((binding, Flags::MODULE | misc_flags))
                         }
-                        Err(DeterminacyExt::Undetermined) =>
+                        Err((Determinacy::Undetermined, Weak::No)) =>
                             return Err(Determinacy::determined(force)),
-                        Err(DeterminacyExt::WeakUndetermined) => Err(Determinacy::Undetermined),
-                        Err(DeterminacyExt::Determined) => Err(Determinacy::Determined),
+                        Err((Determinacy::Undetermined, Weak::Yes)) =>
+                            Err(Determinacy::Undetermined),
+                        Err((Determinacy::Determined, _)) => Err(Determinacy::Determined),
                     }
                 }
                 WhereToResolve::MacroUsePrelude => {

diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs
index b7ec62fee853249db5694f48bffb63fac858b5cb..6dad1426ea363a86900b903a2070d3db984547cb 100644 (file)
--- a/src/librustc_resolve/resolve_imports.rs
+++ b/src/librustc_resolve/resolve_imports.rs
@@ -11,7 +11,7 @@
 use self::ImportDirectiveSubclass::*;
 
 use {AmbiguityError, AmbiguityKind, AmbiguityErrorMisc};
-use {CrateLint, DeterminacyExt, Module, ModuleOrUniformRoot, PerNS, UniformRootKind};
+use {CrateLint, Module, ModuleOrUniformRoot, PerNS, UniformRootKind, Weak};
 use Namespace::{self, TypeNS, MacroNS};
 use {NameBinding, NameBindingKind, ToNameBinding, PathResult, PrivacyError};
 use {Resolver, Segment};
@@ -145,7 +145,7 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
     ) -> Result<&'a NameBinding<'a>, Determinacy> {
         self.resolve_ident_in_module_unadjusted_ext(
             module, ident, ns, None, false, record_used, path_span
-        ).map_err(DeterminacyExt::to_determinacy)
+        ).map_err(|(determinacy, _)| determinacy)
     }
 
     /// Attempts to resolve `ident` in namespaces `ns` of `module`.
@@ -159,7 +159,7 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
         restricted_shadowing: bool,
         record_used: bool,
         path_span: Span,
-    ) -> Result<&'a NameBinding<'a>, DeterminacyExt> {
+    ) -> Result<&'a NameBinding<'a>, (Determinacy, Weak)> {
         let module = match module {
             ModuleOrUniformRoot::Module(module) => module,
             ModuleOrUniformRoot::UniformRoot(uniform_root_kind) => {
@@ -171,9 +171,9 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
                             Ok(binding)
                         } else if !self.graph_root.unresolved_invocations.borrow().is_empty() {
                             // Macro-expanded `extern crate` items can add names to extern prelude.
-                            Err(DeterminacyExt::Undetermined)
+                            Err((Undetermined, Weak::No))
                         } else {
-                            Err(DeterminacyExt::Determined)
+                            Err((Determined, Weak::No))
                         }
                     }
                     UniformRootKind::CurrentScope => {
@@ -198,10 +198,7 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
                         let binding = self.early_resolve_ident_in_lexical_scope(
                             ident, ns, None, true, parent_scope, record_used, record_used, path_span
                         );
-                        return binding.map_err(|determinacy| match determinacy {
-                            Determined => DeterminacyExt::Determined,
-                            Undetermined => DeterminacyExt::Undetermined,
-                        });
+                        return binding.map_err(|determinacy| (determinacy, Weak::No));
                     }
                 }
             }
@@ -211,8 +208,7 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
 
         let resolution = self.resolution(module, ident, ns)
             .try_borrow_mut()
-            // This happens when there is a cycle of imports.
-            .map_err(|_| DeterminacyExt::Determined)?;
+            .map_err(|_| (Determined, Weak::No))?; // This happens when there is a cycle of imports.
 
         if let Some(binding) = resolution.binding {
             if !restricted_shadowing && binding.expansion != Mark::root() {
@@ -226,13 +222,13 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
             // `extern crate` are always usable for backwards compatibility, see issue #37020,
             // remove this together with `PUB_USE_OF_PRIVATE_EXTERN_CRATE`.
             let usable = this.is_accessible(binding.vis) || binding.is_extern_crate();
-            if usable { Ok(binding) } else { Err(DeterminacyExt::Determined) }
+            if usable { Ok(binding) } else { Err((Determined, Weak::No)) }
         };
 
         if record_used {
-            return resolution.binding.ok_or(DeterminacyExt::Determined).and_then(|binding| {
+            return resolution.binding.ok_or((Determined, Weak::No)).and_then(|binding| {
                 if self.last_import_segment && check_usable(self, binding).is_err() {
-                    Err(DeterminacyExt::Determined)
+                    Err((Determined, Weak::No))
                 } else {
                     self.record_use(ident, ns, binding, restricted_shadowing);
 
@@ -279,7 +275,7 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
                 continue;
             }
             let module = unwrap_or!(single_import.imported_module.get(),
-                                    return Err(DeterminacyExt::Undetermined));
+                                    return Err((Undetermined, Weak::No)));
             let ident = match single_import.subclass {
                 SingleImport { source, .. } => source,
                 _ => unreachable!(),
@@ -290,7 +286,7 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
                 Ok(binding) if !self.is_accessible_from(
                     binding.vis, single_import.parent_scope.module
                 ) => continue,
-                Ok(_) | Err(Undetermined) => return Err(DeterminacyExt::Undetermined),
+                Ok(_) | Err(Undetermined) => return Err((Undetermined, Weak::No)),
             }
         }
 
@@ -311,7 +307,7 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
             if !unexpanded_macros || ns == MacroNS || restricted_shadowing {
                 return check_usable(self, binding);
             } else {
-                return Err(DeterminacyExt::Undetermined);
+                return Err((Undetermined, Weak::No));
             }
         }
 
@@ -321,12 +317,12 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
         // expansion. With restricted shadowing names from globs and macro expansions cannot
         // shadow names from outer scopes, so we can freely fallback from module search to search
         // in outer scopes. For `early_resolve_ident_in_lexical_scope` to continue search in outer
-        // scopes we return `WeakUndetermined` instead of full `Undetermined`.
+        // scopes we return `Undetermined` with `Weak::Yes`.
 
         // Check if one of unexpanded macros can still define the name,
         // if it can then our "no resolution" result is not determined and can be invalidated.
         if unexpanded_macros {
-            return Err(DeterminacyExt::WeakUndetermined);
+            return Err((Undetermined, Weak::Yes));
         }
 
         // Check if one of glob imports can still define the name,
@@ -338,7 +334,7 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
             let module = match glob_import.imported_module.get() {
                 Some(ModuleOrUniformRoot::Module(module)) => module,
                 Some(ModuleOrUniformRoot::UniformRoot(_)) => continue,
-                None => return Err(DeterminacyExt::WeakUndetermined),
+                None => return Err((Undetermined, Weak::Yes)),
             };
             let (orig_current_module, mut ident) = (self.current_module, ident.modern());
             match ident.span.glob_adjust(module.expansion, glob_import.span.ctxt().modern()) {
@@ -360,12 +356,12 @@ fn resolution(&self, module: Module<'a>, ident: Ident, ns: Namespace)
                 Ok(binding) if !self.is_accessible_from(
                     binding.vis, glob_import.parent_scope.module
                 ) => continue,
-                Ok(_) | Err(Undetermined) => return Err(DeterminacyExt::WeakUndetermined),
+                Ok(_) | Err(Undetermined) => return Err((Undetermined, Weak::Yes)),
             }
         }
 
         // No resolution and no one else can define the name - determinate error.
-        Err(DeterminacyExt::Determined)
+        Err((Determined, Weak::No))
     }
 
     // Add an import directive to the current module.