Print ParamTy span when accessing a field (#52082)

2 files changed, 153 insertions, 0 deletions

diff --git a/src/test/ui/typeck/issue-52082.rs b/src/test/ui/typeck/issue-52082.rs
new file mode 100644
index 00000000000..c57e8149574
--- /dev/null
+++ b/src/test/ui/typeck/issue-52082.rs
@@ -0,0 +1,54 @@
+// Fix issue 52082: Confusing error if accidentially defining a type paramter with the same name as
+// an existing type
+//
+// To this end, make sure that when trying to retrieve a field of a (reference to) type parameter,
+// rustc points to the point where the parameter was defined.
+#[derive(Debug)]
+struct Point
+{
+    x: i32,
+    y: i32
+}
+
+impl Point
+{
+    fn add(a: &Point, b: &Point) -> Point
+    {
+        Point {x: a.x + b.x, y: a.y + b.y}
+    }
+}
+
+trait Eq
+{
+    fn equals_ref<T>(a: &T, b: &T) -> bool;
+    fn equals_val<T>(a: T, b: T) -> bool;
+}
+
+impl Eq for Point
+{
+    fn equals_ref<Point>(a: &Point, b: &Point) -> bool
+    {
+        a.x == b.x && a.y == b.y //~ ERROR no field `x` on type `&Point` [E0609]
+                                 //~|ERROR no field `x` on type `&Point` [E0609]
+                                 //~|ERROR no field `y` on type `&Point` [E0609]
+                                 //~|ERROR no field `y` on type `&Point` [E0609]
+    }
+
+    fn equals_val<Point>(a: Point, b: Point) -> bool
+    {
+        a.x == b.x && a.y == b.y //~ ERROR no field `x` on type `Point` [E0609]
+                                 //~|ERROR no field `x` on type `Point` [E0609]
+                                 //~|ERROR no field `y` on type `Point` [E0609]
+                                 //~|ERROR no field `y` on type `Point` [E0609]
+    }
+}
+
+fn main()
+{
+    let p1 = Point {x:  0, y: 10};
+    let p2 = Point {x: 20, y: 42};
+    println!("{:?}", Point::add(&p1, &p2));
+    println!("p1: {:?}, p2: {:?}", p1, p2);
+    println!("&p1 == &p2: {:?}", Point::equals_ref(&p1, &p2));
+    println!("p1 == p2: {:?}", Point::equals_val(p1, p2));
+}
diff --git a/src/test/ui/typeck/issue-52082.stderr b/src/test/ui/typeck/issue-52082.stderr
new file mode 100644
index 00000000000..b6b616630d5
--- /dev/null
+++ b/src/test/ui/typeck/issue-52082.stderr
@@ -0,0 +1,99 @@
+error[E0609]: no field `x` on type `&Point`
+  --> $DIR/issue-52082.rs:31:11
+   |
+LL |         a.x == b.x && a.y == b.y
+   |           ^
+   |
+note: Type parameter 'Point' was declared here
+  --> $DIR/issue-52082.rs:29:19
+   |
+LL |     fn equals_ref<Point>(a: &Point, b: &Point) -> bool
+   |                   ^^^^^
+
+error[E0609]: no field `x` on type `&Point`
+  --> $DIR/issue-52082.rs:31:18
+   |
+LL |         a.x == b.x && a.y == b.y
+   |                  ^
+   |
+note: Type parameter 'Point' was declared here
+  --> $DIR/issue-52082.rs:29:19
+   |
+LL |     fn equals_ref<Point>(a: &Point, b: &Point) -> bool
+   |                   ^^^^^
+
+error[E0609]: no field `y` on type `&Point`
+  --> $DIR/issue-52082.rs:31:25
+   |
+LL |         a.x == b.x && a.y == b.y
+   |                         ^
+   |
+note: Type parameter 'Point' was declared here
+  --> $DIR/issue-52082.rs:29:19
+   |
+LL |     fn equals_ref<Point>(a: &Point, b: &Point) -> bool
+   |                   ^^^^^
+
+error[E0609]: no field `y` on type `&Point`
+  --> $DIR/issue-52082.rs:31:32
+   |
+LL |         a.x == b.x && a.y == b.y
+   |                                ^
+   |
+note: Type parameter 'Point' was declared here
+  --> $DIR/issue-52082.rs:29:19
+   |
+LL |     fn equals_ref<Point>(a: &Point, b: &Point) -> bool
+   |                   ^^^^^
+
+error[E0609]: no field `x` on type `Point`
+  --> $DIR/issue-52082.rs:39:11
+   |
+LL |         a.x == b.x && a.y == b.y
+   |           ^
+   |
+note: Type parameter 'Point' was declared here
+  --> $DIR/issue-52082.rs:37:19
+   |
+LL |     fn equals_val<Point>(a: Point, b: Point) -> bool
+   |                   ^^^^^
+
+error[E0609]: no field `x` on type `Point`
+  --> $DIR/issue-52082.rs:39:18
+   |
+LL |         a.x == b.x && a.y == b.y
+   |                  ^
+   |
+note: Type parameter 'Point' was declared here
+  --> $DIR/issue-52082.rs:37:19
+   |
+LL |     fn equals_val<Point>(a: Point, b: Point) -> bool
+   |                   ^^^^^
+
+error[E0609]: no field `y` on type `Point`
+  --> $DIR/issue-52082.rs:39:25
+   |
+LL |         a.x == b.x && a.y == b.y
+   |                         ^
+   |
+note: Type parameter 'Point' was declared here
+  --> $DIR/issue-52082.rs:37:19
+   |
+LL |     fn equals_val<Point>(a: Point, b: Point) -> bool
+   |                   ^^^^^
+
+error[E0609]: no field `y` on type `Point`
+  --> $DIR/issue-52082.rs:39:32
+   |
+LL |         a.x == b.x && a.y == b.y
+   |                                ^
+   |
+note: Type parameter 'Point' was declared here
+  --> $DIR/issue-52082.rs:37:19
+   |
+LL |     fn equals_val<Point>(a: Point, b: Point) -> bool
+   |                   ^^^^^
+
+error: aborting due to 8 previous errors
+
+For more information about this error, try `rustc --explain E0609`.