Use the same collection order as check_mod_type_wf

oli-obk · oli-obk · commit 435abb24da54 · 2024-02-23T11:09:57.000Z
diff --git a/compiler/rustc_hir_analysis/src/collect.rs b/compiler/rustc_hir_analysis/src/collect.rs
@@ -58,12 +58,12 @@ fn collect_mod_item_types(tcx: TyCtxt<'_>, module_def_id: LocalModDefId) {
     let items = tcx.hir_module_items(module_def_id);
     let hir = tcx.hir();
     let _ = items.par_items(|item| Ok(CollectItemTypesVisitor { tcx }.visit_item(hir.item(item))));
-    let _ = items.par_trait_items(|item| {
-        Ok(CollectItemTypesVisitor { tcx }.visit_trait_item(hir.trait_item(item)))
-    });
     let _ = items.par_impl_items(|item| {
         Ok(CollectItemTypesVisitor { tcx }.visit_impl_item(hir.impl_item(item)))
     });
+    let _ = items.par_trait_items(|item| {
+        Ok(CollectItemTypesVisitor { tcx }.visit_trait_item(hir.trait_item(item)))
+    });
     let _ = items.par_foreign_items(|item| {
         Ok(CollectItemTypesVisitor { tcx }.visit_foreign_item(hir.foreign_item(item)))
     });
diff --git a/tests/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.stderr b/tests/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.stderr
@@ -62,66 +62,66 @@ LL | fn c<C>(_: <C as Vehicle>::Color) where C : Vehicle, C : Box {
    |            ~~~~~~~~~~~~~~~~
 
 error[E0221]: ambiguous associated type `Color` in bounds of `X`
-  --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:35:20
+  --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:30:20
    |
 LL |     type Color;
    |     ---------- ambiguous `Color` from `Vehicle`
 ...
 LL |     type Color;
    |     ---------- ambiguous `Color` from `Box`
 ...
-LL |     fn e(&self, _: X::Color) where X : Box;
+LL |     fn d(&self, _: X::Color) where X : Box { }
    |                    ^^^^^^^^ ambiguous associated type `Color`
    |
 help: use fully-qualified syntax to disambiguate
    |
-LL |     fn e(&self, _: <X as Box>::Color) where X : Box;
+LL |     fn d(&self, _: <X as Box>::Color) where X : Box { }
    |                    ~~~~~~~~~~~~
 help: use fully-qualified syntax to disambiguate
    |
-LL |     fn e(&self, _: <X as Vehicle>::Color) where X : Box;
+LL |     fn d(&self, _: <X as Vehicle>::Color) where X : Box { }
    |                    ~~~~~~~~~~~~~~~~
 
 error[E0221]: ambiguous associated type `Color` in bounds of `X`
-  --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:38:20
+  --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:35:20
    |
 LL |     type Color;
    |     ---------- ambiguous `Color` from `Vehicle`
 ...
 LL |     type Color;
    |     ---------- ambiguous `Color` from `Box`
 ...
-LL |     fn f(&self, _: X::Color) where X : Box { }
+LL |     fn e(&self, _: X::Color) where X : Box;
    |                    ^^^^^^^^ ambiguous associated type `Color`
    |
 help: use fully-qualified syntax to disambiguate
    |
-LL |     fn f(&self, _: <X as Box>::Color) where X : Box { }
+LL |     fn e(&self, _: <X as Box>::Color) where X : Box;
    |                    ~~~~~~~~~~~~
 help: use fully-qualified syntax to disambiguate
    |
-LL |     fn f(&self, _: <X as Vehicle>::Color) where X : Box { }
+LL |     fn e(&self, _: <X as Vehicle>::Color) where X : Box;
    |                    ~~~~~~~~~~~~~~~~
 
 error[E0221]: ambiguous associated type `Color` in bounds of `X`
-  --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:30:20
+  --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:38:20
    |
 LL |     type Color;
    |     ---------- ambiguous `Color` from `Vehicle`
 ...
 LL |     type Color;
    |     ---------- ambiguous `Color` from `Box`
 ...
-LL |     fn d(&self, _: X::Color) where X : Box { }
+LL |     fn f(&self, _: X::Color) where X : Box { }
    |                    ^^^^^^^^ ambiguous associated type `Color`
    |
 help: use fully-qualified syntax to disambiguate
    |
-LL |     fn d(&self, _: <X as Box>::Color) where X : Box { }
+LL |     fn f(&self, _: <X as Box>::Color) where X : Box { }
    |                    ~~~~~~~~~~~~
 help: use fully-qualified syntax to disambiguate
    |
-LL |     fn d(&self, _: <X as Vehicle>::Color) where X : Box { }
+LL |     fn f(&self, _: <X as Vehicle>::Color) where X : Box { }
    |                    ~~~~~~~~~~~~~~~~
 
 error: aborting due to 6 previous errors
diff --git a/tests/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr b/tests/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr
@@ -1,24 +1,24 @@
 error[E0212]: cannot use the associated type of a trait with uninferred generic parameters
-  --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:13:32
+  --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:32:24
    |
-LL |     fn some_method(&self, arg: I::A);
-   |                                ^^^^
+LL |     fn mango(&self) -> X::Assoc {
+   |                        ^^^^^^^^
    |
 help: use a fully qualified path with inferred lifetimes
    |
-LL |     fn some_method(&self, arg: <I as Foo<&isize>>::A);
-   |                                ~~~~~~~~~~~~~~~~~~~~
+LL |     fn mango(&self) -> <X as Banana<'_>>::Assoc {
+   |                        ~~~~~~~~~~~~~~~~~~~
 
 error[E0212]: cannot use the associated type of a trait with uninferred generic parameters
-  --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:32:24
+  --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:13:32
    |
-LL |     fn mango(&self) -> X::Assoc {
-   |                        ^^^^^^^^
+LL |     fn some_method(&self, arg: I::A);
+   |                                ^^^^
    |
 help: use a fully qualified path with inferred lifetimes
    |
-LL |     fn mango(&self) -> <X as Banana<'_>>::Assoc {
-   |                        ~~~~~~~~~~~~~~~~~~~
+LL |     fn some_method(&self, arg: <I as Foo<&isize>>::A);
+   |                                ~~~~~~~~~~~~~~~~~~~~
 
 error: aborting due to 2 previous errors
 
diff --git a/tests/ui/const-generics/generic_arg_infer/in-signature.stderr b/tests/ui/const-generics/generic_arg_infer/in-signature.stderr
@@ -74,26 +74,6 @@ LL | static TY_STATIC_MIXED: Bar<_, _> = Bar::<i32, 3>(0);
    |                         not allowed in type signatures
    |                         help: replace with the correct type: `Bar<i32, 3>`
 
-error[E0121]: the placeholder `_` is not allowed within types on item signatures for associated constants
-  --> $DIR/in-signature.rs:35:21
-   |
-LL |     const ARR: [u8; _];
-   |                     ^ not allowed in type signatures
-
-error[E0121]: the placeholder `_` is not allowed within types on item signatures for associated constants
-  --> $DIR/in-signature.rs:39:25
-   |
-LL |     const ARR: Bar<i32, _>;
-   |                         ^ not allowed in type signatures
-
-error[E0121]: the placeholder `_` is not allowed within types on item signatures for associated constants
-  --> $DIR/in-signature.rs:43:20
-   |
-LL |     const ARR: Bar<_, _>;
-   |                    ^  ^ not allowed in type signatures
-   |                    |
-   |                    not allowed in type signatures
-
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for associated types
   --> $DIR/in-signature.rs:51:23
    |
@@ -114,6 +94,26 @@ LL |     type Assoc = Bar<_, _>;
    |                      |
    |                      not allowed in type signatures
 
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for associated constants
+  --> $DIR/in-signature.rs:35:21
+   |
+LL |     const ARR: [u8; _];
+   |                     ^ not allowed in type signatures
+
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for associated constants
+  --> $DIR/in-signature.rs:39:25
+   |
+LL |     const ARR: Bar<i32, _>;
+   |                         ^ not allowed in type signatures
+
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for associated constants
+  --> $DIR/in-signature.rs:43:20
+   |
+LL |     const ARR: Bar<_, _>;
+   |                    ^  ^ not allowed in type signatures
+   |                    |
+   |                    not allowed in type signatures
+
 error: aborting due to 15 previous errors
 
 For more information about this error, try `rustc --explain E0121`.
diff --git a/tests/ui/delegation/not-supported.stderr b/tests/ui/delegation/not-supported.stderr
@@ -7,24 +7,6 @@ LL | #![feature(fn_delegation)]
    = note: see issue #118212 <https://github.com/rust-lang/rust/issues/118212> for more information
    = note: `#[warn(incomplete_features)]` on by default
 
-error: delegation with early bound generics is not supported yet
-  --> $DIR/not-supported.rs:16:29
-   |
-LL |         fn bar(&self, x: T) -> T { x }
-   |         ------------------------ callee defined here
-...
-LL |         reuse GenericTrait::bar;
-   |                             ^^^
-
-error: delegation with early bound generics is not supported yet
-  --> $DIR/not-supported.rs:18:29
-   |
-LL |         fn bar1() {}
-   |         --------- callee defined here
-...
-LL |         reuse GenericTrait::bar1;
-   |                             ^^^^
-
 error: delegation with early bound generics is not supported yet
   --> $DIR/not-supported.rs:29:39
    |
@@ -97,6 +79,24 @@ LL |         fn foo(&self, x: i32) -> i32 { x }
 LL |         reuse Trait::foo { &self.0 }
    |                      ^^^
 
+error: delegation with early bound generics is not supported yet
+  --> $DIR/not-supported.rs:16:29
+   |
+LL |         fn bar(&self, x: T) -> T { x }
+   |         ------------------------ callee defined here
+...
+LL |         reuse GenericTrait::bar;
+   |                             ^^^
+
+error: delegation with early bound generics is not supported yet
+  --> $DIR/not-supported.rs:18:29
+   |
+LL |         fn bar1() {}
+   |         --------- callee defined here
+...
+LL |         reuse GenericTrait::bar1;
+   |                             ^^^^
+
 error: delegation with early bound generics is not supported yet
   --> $DIR/not-supported.rs:74:21
    |
diff --git a/tests/ui/generic-associated-types/elided-in-expr-position.stderr b/tests/ui/generic-associated-types/elided-in-expr-position.stderr
@@ -1,7 +1,7 @@
 error[E0107]: missing generics for associated type `Trait::Assoc`
-  --> $DIR/elided-in-expr-position.rs:9:26
+  --> $DIR/elided-in-expr-position.rs:31:26
    |
-LL |     fn g(&self) -> Self::Assoc;
+LL |     fn g(&self) -> Self::Assoc {
    |                          ^^^^^ expected 1 lifetime argument
    |
 note: associated type defined here, with 1 lifetime parameter: `'a`
@@ -11,13 +11,13 @@ LL |     type Assoc<'a> where Self: 'a;
    |          ^^^^^ --
 help: add missing lifetime argument
    |
-LL |     fn g(&self) -> Self::Assoc<'_>;
+LL |     fn g(&self) -> Self::Assoc<'_> {
    |                               ++++
 
 error[E0107]: missing generics for associated type `Trait::Assoc`
-  --> $DIR/elided-in-expr-position.rs:31:26
+  --> $DIR/elided-in-expr-position.rs:9:26
    |
-LL |     fn g(&self) -> Self::Assoc {
+LL |     fn g(&self) -> Self::Assoc;
    |                          ^^^^^ expected 1 lifetime argument
    |
 note: associated type defined here, with 1 lifetime parameter: `'a`
@@ -27,7 +27,7 @@ LL |     type Assoc<'a> where Self: 'a;
    |          ^^^^^ --
 help: add missing lifetime argument
    |
-LL |     fn g(&self) -> Self::Assoc<'_> {
+LL |     fn g(&self) -> Self::Assoc<'_>;
    |                               ++++
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/rfcs/rfc-2396-target_feature-11/trait-impl.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/trait-impl.stderr
@@ -1,5 +1,5 @@
 error: `#[target_feature(..)]` cannot be applied to safe trait method
-  --> $DIR/trait-impl.rs:22:5
+  --> $DIR/trait-impl.rs:13:5
    |
 LL |     #[target_feature(enable = "sse2")]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be applied to safe trait method
@@ -8,7 +8,7 @@ LL |     fn foo(&self) {}
    |     ------------- not an `unsafe` function
 
 error: `#[target_feature(..)]` cannot be applied to safe trait method
-  --> $DIR/trait-impl.rs:13:5
+  --> $DIR/trait-impl.rs:22:5
    |
 LL |     #[target_feature(enable = "sse2")]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be applied to safe trait method
diff --git a/tests/ui/typeck/type-placeholder-fn-in-const.stderr b/tests/ui/typeck/type-placeholder-fn-in-const.stderr
@@ -1,25 +1,25 @@
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for functions
-  --> $DIR/type-placeholder-fn-in-const.rs:4:25
+  --> $DIR/type-placeholder-fn-in-const.rs:10:25
    |
-LL |     const TEST: fn() -> _;
+LL |     const TEST: fn() -> _ = 42;
    |                         ^ not allowed in type signatures
 
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for associated constants
-  --> $DIR/type-placeholder-fn-in-const.rs:4:25
+  --> $DIR/type-placeholder-fn-in-const.rs:10:25
    |
-LL |     const TEST: fn() -> _;
+LL |     const TEST: fn() -> _ = 42;
    |                         ^ not allowed in type signatures
 
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for functions
-  --> $DIR/type-placeholder-fn-in-const.rs:10:25
+  --> $DIR/type-placeholder-fn-in-const.rs:4:25
    |
-LL |     const TEST: fn() -> _ = 42;
+LL |     const TEST: fn() -> _;
    |                         ^ not allowed in type signatures
 
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for associated constants
-  --> $DIR/type-placeholder-fn-in-const.rs:10:25
+  --> $DIR/type-placeholder-fn-in-const.rs:4:25
    |
-LL |     const TEST: fn() -> _ = 42;
+LL |     const TEST: fn() -> _;
    |                         ^ not allowed in type signatures
 
 error: aborting due to 4 previous errors
diff --git a/tests/ui/typeck/typeck_type_placeholder_item.stderr b/tests/ui/typeck/typeck_type_placeholder_item.stderr
diff --git a/tests/ui/typeck/typeck_type_placeholder_item_help.stderr b/tests/ui/typeck/typeck_type_placeholder_item_help.stderr

Original file line number	Diff line number	Diff line change
`@@ -1,24 +1,24 @@`
`1`	`1`	`error[E0212]: cannot use the associated type of a trait with uninferred generic parameters`
`2`		`- --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:13:32`
	`2`	`+ --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:32:24`
`3`	`3`	`\|`
`4`		`-LL \| fn some_method(&self, arg: I::A);`
`5`		`- \| ^^^^`
	`4`	`+LL \| fn mango(&self) -> X::Assoc {`
	`5`	`+ \| ^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	`help: use a fully qualified path with inferred lifetimes`
`8`	`8`	`\|`
`9`		`-LL \| fn some_method(&self, arg: <I as Foo<&isize>>::A);`
`10`		`- \| ~~~~~~~~~~~~~~~~~~~~`
	`9`	`+LL \| fn mango(&self) -> <X as Banana<'_>>::Assoc {`
	`10`	`+ \| ~~~~~~~~~~~~~~~~~~~`
`11`	`11`
`12`	`12`	`error[E0212]: cannot use the associated type of a trait with uninferred generic parameters`
`13`		`- --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:32:24`
	`13`	`+ --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:13:32`
`14`	`14`	`\|`
`15`		`-LL \| fn mango(&self) -> X::Assoc {`
`16`		`- \| ^^^^^^^^`
	`15`	`+LL \| fn some_method(&self, arg: I::A);`
	`16`	`+ \| ^^^^`
`17`	`17`	`\|`
`18`	`18`	`help: use a fully qualified path with inferred lifetimes`
`19`	`19`	`\|`
`20`		`-LL \| fn mango(&self) -> <X as Banana<'_>>::Assoc {`
`21`		`- \| ~~~~~~~~~~~~~~~~~~~`
	`20`	`+LL \| fn some_method(&self, arg: <I as Foo<&isize>>::A);`
	`21`	`+ \| ~~~~~~~~~~~~~~~~~~~~`
`22`	`22`
`23`	`23`	`error: aborting due to 2 previous errors`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	error[E0107]: missing generics for associated type `Trait::Assoc`
`2`		`- --> $DIR/elided-in-expr-position.rs:9:26`
	`2`	`+ --> $DIR/elided-in-expr-position.rs:31:26`
`3`	`3`	`\|`
`4`		`-LL \| fn g(&self) -> Self::Assoc;`
	`4`	`+LL \| fn g(&self) -> Self::Assoc {`
`5`	`5`	`\| ^^^^^ expected 1 lifetime argument`
`6`	`6`	`\|`
`7`	`7`	note: associated type defined here, with 1 lifetime parameter: `'a`
`@@ -11,13 +11,13 @@ LL \| type Assoc<'a> where Self: 'a;`
`11`	`11`	`\| ^^^^^ --`
`12`	`12`	`help: add missing lifetime argument`
`13`	`13`	`\|`
`14`		`-LL \| fn g(&self) -> Self::Assoc<'_>;`
	`14`	`+LL \| fn g(&self) -> Self::Assoc<'_> {`
`15`	`15`	`\| ++++`
`16`	`16`
`17`	`17`	error[E0107]: missing generics for associated type `Trait::Assoc`
`18`		`- --> $DIR/elided-in-expr-position.rs:31:26`
	`18`	`+ --> $DIR/elided-in-expr-position.rs:9:26`
`19`	`19`	`\|`
`20`		`-LL \| fn g(&self) -> Self::Assoc {`
	`20`	`+LL \| fn g(&self) -> Self::Assoc;`
`21`	`21`	`\| ^^^^^ expected 1 lifetime argument`
`22`	`22`	`\|`
`23`	`23`	note: associated type defined here, with 1 lifetime parameter: `'a`
`@@ -27,7 +27,7 @@ LL \| type Assoc<'a> where Self: 'a;`
`27`	`27`	`\| ^^^^^ --`
`28`	`28`	`help: add missing lifetime argument`
`29`	`29`	`\|`
`30`		`-LL \| fn g(&self) -> Self::Assoc<'_> {`
	`30`	`+LL \| fn g(&self) -> Self::Assoc<'_>;`
`31`	`31`	`\| ++++`
`32`	`32`
`33`	`33`	`error: aborting due to 2 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error: `#[target_feature(..)]` cannot be applied to safe trait method
`2`		`- --> $DIR/trait-impl.rs:22:5`
	`2`	`+ --> $DIR/trait-impl.rs:13:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[target_feature(enable = "sse2")]`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be applied to safe trait method`
`@@ -8,7 +8,7 @@ LL \| fn foo(&self) {}`
`8`	`8`	\| ------------- not an `unsafe` function
`9`	`9`
`10`	`10`	error: `#[target_feature(..)]` cannot be applied to safe trait method
`11`		`- --> $DIR/trait-impl.rs:13:5`
	`11`	`+ --> $DIR/trait-impl.rs:22:5`
`12`	`12`	`\|`
`13`	`13`	`LL \| #[target_feature(enable = "sse2")]`
`14`	`14`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be applied to safe trait method`