diff options
| author | Matthew Jasper <mjjasper1@gmail.com> | 2019-08-11 18:09:50 +0100 |
|---|---|---|
| committer | Matthew Jasper <mjjasper1@gmail.com> | 2019-08-17 09:12:32 +0100 |
| commit | f70c90c677e98f5267cc7c66fadef76e269097cb (patch) | |
| tree | aeaddd7d62b935f92ab3f8df445b1ea09c6bb935 /src/test/ui/shadowed | |
| parent | 3296d0ed6d1ce5f2f20398c5765c7876d2c63da2 (diff) | |
| download | rust-f70c90c677e98f5267cc7c66fadef76e269097cb.tar.gz rust-f70c90c677e98f5267cc7c66fadef76e269097cb.zip | |
Move type parameter shadowing errors to resolve
For some reason type checking did this. Further it didn't consider hygiene.
Diffstat (limited to 'src/test/ui/shadowed')
| -rw-r--r-- | src/test/ui/shadowed/shadowed-type-parameter.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/shadowed/shadowed-type-parameter.stderr | 30 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/test/ui/shadowed/shadowed-type-parameter.rs b/src/test/ui/shadowed/shadowed-type-parameter.rs index ba9f3abcf7a..e74620f8900 100644 --- a/src/test/ui/shadowed/shadowed-type-parameter.rs +++ b/src/test/ui/shadowed/shadowed-type-parameter.rs @@ -6,7 +6,7 @@ struct Foo<T>(T); impl<T> Foo<T> { fn shadow_in_method<T>(&self) {} - //~^ ERROR type parameter `T` shadows another type parameter + //~^ ERROR the name `T` is already used fn not_shadow_in_item<U>(&self) { struct Bar<T, U>(T,U); // not a shadow, separate item @@ -18,10 +18,10 @@ trait Bar<T> { fn dummy(&self) -> T; fn shadow_in_required<T>(&self); - //~^ ERROR type parameter `T` shadows another type parameter + //~^ ERROR the name `T` is already used fn shadow_in_provided<T>(&self) {} - //~^ ERROR type parameter `T` shadows another type parameter + //~^ ERROR the name `T` is already used fn not_shadow_in_required<U>(&self); fn not_shadow_in_provided<U>(&self) {} diff --git a/src/test/ui/shadowed/shadowed-type-parameter.stderr b/src/test/ui/shadowed/shadowed-type-parameter.stderr index 6b4d1fae3de..0ea82f983f1 100644 --- a/src/test/ui/shadowed/shadowed-type-parameter.stderr +++ b/src/test/ui/shadowed/shadowed-type-parameter.stderr @@ -1,29 +1,29 @@ -error[E0194]: type parameter `T` shadows another type parameter of the same name +error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters + --> $DIR/shadowed-type-parameter.rs:8:25 + | +LL | impl<T> Foo<T> { + | - first use of `T` +LL | fn shadow_in_method<T>(&self) {} + | ^ already used + +error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters --> $DIR/shadowed-type-parameter.rs:20:27 | LL | trait Bar<T> { - | - first `T` declared here + | - first use of `T` ... LL | fn shadow_in_required<T>(&self); - | ^ shadows another type parameter + | ^ already used -error[E0194]: type parameter `T` shadows another type parameter of the same name +error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters --> $DIR/shadowed-type-parameter.rs:23:27 | LL | trait Bar<T> { - | - first `T` declared here + | - first use of `T` ... LL | fn shadow_in_provided<T>(&self) {} - | ^ shadows another type parameter - -error[E0194]: type parameter `T` shadows another type parameter of the same name - --> $DIR/shadowed-type-parameter.rs:8:25 - | -LL | impl<T> Foo<T> { - | - first `T` declared here -LL | fn shadow_in_method<T>(&self) {} - | ^ shadows another type parameter + | ^ already used error: aborting due to 3 previous errors -For more information about this error, try `rustc --explain E0194`. +For more information about this error, try `rustc --explain E0403`. |