about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAriel Ben-Yehuda <arielb1@mail.tau.ac.il>2017-06-29 08:40:10 +0000
committerGitHub <noreply@github.com>2017-06-29 08:40:10 +0000
commit4f121542e92b526db18e5f6a4824d4f5c00c5284 (patch)
treee982fd5de9b979e2d3edc84a00b3f7b94ea07e90
parent486aca787a20fb7e22ab5606a97a7e89d8cf0f4d (diff)
parent5ed38946beaaad4ece7ad43bc3d03db7e8972401 (diff)
Rollup merge of #42953 - estebank:fix-20729, r=petrochenkov
Move type parameter shadowing test to `ui`

Fix #20729.
-rw-r--r--src/test/ui/shadowed-type-parameter.rs (renamed from src/test/compile-fail/shadowed-type-parameter.rs)0
-rw-r--r--src/test/ui/shadowed-type-parameter.stderr28
2 files changed, 28 insertions, 0 deletions
diff --git a/src/test/compile-fail/shadowed-type-parameter.rs b/src/test/ui/shadowed-type-parameter.rs
index 1f72db1e894..1f72db1e894 100644
--- a/src/test/compile-fail/shadowed-type-parameter.rs
+++ b/src/test/ui/shadowed-type-parameter.rs
diff --git a/src/test/ui/shadowed-type-parameter.stderr b/src/test/ui/shadowed-type-parameter.stderr
new file mode 100644
index 00000000000..d77523299bc
--- /dev/null
+++ b/src/test/ui/shadowed-type-parameter.stderr
@@ -0,0 +1,28 @@
+error[E0194]: type parameter `T` shadows another type parameter of the same name
+  --> $DIR/shadowed-type-parameter.rs:30:27
+   |
+27 | trait Bar<T> {
+   |           - first `T` declared here
+...
+30 |     fn shadow_in_required<T>(&self);
+   |                           ^ shadows another type parameter
+
+error[E0194]: type parameter `T` shadows another type parameter of the same name
+  --> $DIR/shadowed-type-parameter.rs:33:27
+   |
+27 | trait Bar<T> {
+   |           - first `T` declared here
+...
+33 |     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:18:25
+   |
+17 | impl<T> Foo<T> {
+   |      - first `T` declared here
+18 |     fn shadow_in_method<T>(&self) {}
+   |                         ^ shadows another type parameter
+
+error: aborting due to previous error(s)
+