review comments

Author: estebank

src/librustc_resolve/diagnostics.rs

@@ -18,6 +18,39 @@ use crate::{import_candidate_to_enum_paths, is_self_type, is_self_value, path_na
 use crate::{AssocSuggestion, CrateLint, ImportSuggestion, ModuleOrUniformRoot, PathResult,
             PathSource, Resolver, Segment, Suggestion};
 
+#[derive(Clone, Copy)]
+crate enum CurrentScope {
+    Const,
+    Static,
+    Type,
+    Other,
+}
+
+impl CurrentScope {
+    crate fn is_other(&self) -> bool {
+        match self {
+            CurrentScope::Other => true,
+            _ => false,
+        }
+    }
+
+    crate fn description(&self) -> &'static str {
+        match self {
+            Self::Const => "a `const`",
+            Self::Static => "a `static`",
+            Self::Type => "associated type",
+            Self::Other => "outer function",
+        }
+    }
+
+    crate fn generic_param_resolution_error_message(&self) -> String {
+        match self {
+            Self::Other => format!("from {}", self.description()),
+            _ => format!("in {}", self.description()),
+        }
+    }
+}
+
 impl<'a> Resolver<'a> {
     /// Handles error reporting for `smart_resolve_path_fragment` function.
     /// Creates base error and amends it with one short label and possibly some longer helps/notes.

src/librustc_resolve/lib.rs

@@ -70,7 +70,9 @@ use rustc_data_structures::ptr_key::PtrKey;
 use rustc_data_structures::sync::Lrc;
 use smallvec::SmallVec;
 
-use diagnostics::{find_span_of_binding_until_next_binding, extend_span_to_previous_binding};
+use diagnostics::{
+    find_span_of_binding_until_next_binding, extend_span_to_previous_binding, CurrentScope,
+};
 use resolve_imports::{ImportDirective, ImportDirectiveSubclass, NameResolution, ImportResolver};
 use macros::{InvocationData, LegacyBinding, ParentScope};
 
@@ -194,39 +196,6 @@ enum ResolutionError<'a> {
     ConstParamDependentOnTypeParam,
 }
 
-#[derive(Clone, Copy)]
-enum CurrentScope {
-    Const,
-    Static,
-    Type,
-    Other,
-}
-
-impl CurrentScope {
-    fn is_other(&self) -> bool {
-        match self {
-            CurrentScope::Other => true,
-            _ => false,
-        }
-    }
-
-    fn description(&self) -> &'static str {
-        match self {
-            Self::Const => "`const` associated item",
-            Self::Static => "`static` associated item",
-            Self::Type => "associated type",
-            Self::Other => "outer function",
-        }
-    }
-
-    fn generic_param_resolution_error_message(&self) -> String {
-        match self {
-            Self::Other => format!("from {}", self.description()),
-            _ => format!("in {}", self.description()),
-        }
-    }
-}
-
 /// Combines an error with provided span and emits it.
 ///
 /// This takes the error provided, combines it with the span and any additional spans inside the

src/test/ui/inner-static-type-parameter.rs

@@ -4,7 +4,7 @@ enum Bar<T> { What } //~ ERROR parameter `T` is never used
 
 fn foo<T>() {
     static a: Bar<T> = Bar::What;
-    //~^ ERROR can't use generic parameters in `static` associated item
+    //~^ ERROR can't use generic parameters in a `static`
 }
 
 fn main() {

src/test/ui/inner-static-type-parameter.stderr

@@ -1,12 +1,12 @@
-error[E0401]: can't use generic parameters in `static` associated item
+error[E0401]: can't use generic parameters in a `static`
   --> $DIR/inner-static-type-parameter.rs:6:19
    |
 LL | fn foo<T>() {
    |        - type parameter being used
 LL |     static a: Bar<T> = Bar::What;
-   |                   ^ use of generic parameter in `static` associated item
+   |                   ^ use of generic parameter in a `static`
    |
-   = help: `static` associated item need a type instead of a generic parameter
+   = help: a `static` need a type instead of a generic parameter
 
 error[E0392]: parameter `T` is never used
   --> $DIR/inner-static-type-parameter.rs:3:10

src/test/ui/issues/issue-45447.rs

@@ -2,8 +2,8 @@ trait Foo { const FOO: Self; }
 impl Foo for u32 { const FOO: Self = 1; }
 fn bar<T: Foo>(n: T) {
     const BASE: T = T::FOO;
-    //~^ ERROR can't use generic parameters in `const` associated item
-    //~| ERROR can't use generic parameters in `const` associated item
+    //~^ ERROR can't use generic parameters in a `const`
+    //~| ERROR can't use generic parameters in a `const`
     type Type = T;
     //~^ ERROR can't use generic parameters in associated type
 }

src/test/ui/issues/issue-45447.stderr

@@ -1,22 +1,22 @@
-error[E0401]: can't use generic parameters in `const` associated item
+error[E0401]: can't use generic parameters in a `const`
   --> $DIR/issue-45447.rs:4:17
    |
 LL | fn bar<T: Foo>(n: T) {
    |        - type parameter being used
 LL |     const BASE: T = T::FOO;
-   |                 ^ use of generic parameter in `const` associated item
+   |                 ^ use of generic parameter in a `const`
    |
-   = help: `const` associated item need a type instead of a generic parameter
+   = help: a `const` need a type instead of a generic parameter
 
-error[E0401]: can't use generic parameters in `const` associated item
+error[E0401]: can't use generic parameters in a `const`
   --> $DIR/issue-45447.rs:4:21
    |
 LL | fn bar<T: Foo>(n: T) {
    |        - type parameter being used
 LL |     const BASE: T = T::FOO;
-   |                     ^^^^^^ use of generic parameter in `const` associated item
+   |                     ^^^^^^ use of generic parameter in a `const`
    |
-   = help: `const` associated item need a type instead of a generic parameter
+   = help: a `const` need a type instead of a generic parameter
 
 error[E0401]: can't use generic parameters in associated type
   --> $DIR/issue-45447.rs:7:17