Remove E0308 note when primary label has all info

[rust.git] / src / test / ui / wrong-mul-method-signature.stderr

diff --git a/src/test/ui/wrong-mul-method-signature.stderr b/src/test/ui/wrong-mul-method-signature.stderr
index 8630ebcb58042b46e9aaea5f893ccdd37d6a1c74..fb21980805fa8b2114ff0e72f391276bf59f93e2 100644 (file)
--- a/src/test/ui/wrong-mul-method-signature.stderr
+++ b/src/test/ui/wrong-mul-method-signature.stderr
@@ -4,8 +4,8 @@ error[E0053]: method `mul` has an incompatible type for trait
 LL |     fn mul(self, s: &f64) -> Vec1 {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected f64, found &f64
    |
-   = note: expected type `fn(Vec1, f64) -> Vec1`
-              found type `fn(Vec1, &f64) -> Vec1`
+   = note: expected fn pointer `fn(Vec1, f64) -> Vec1`
+              found fn pointer `fn(Vec1, &f64) -> Vec1`
 
 error[E0053]: method `mul` has an incompatible type for trait
   --> $DIR/wrong-mul-method-signature.rs:33:5
@@ -13,8 +13,8 @@ error[E0053]: method `mul` has an incompatible type for trait
 LL |     fn mul(self, s: f64) -> Vec2 {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `Vec2`, found f64
    |
-   = note: expected type `fn(Vec2, Vec2) -> f64`
-              found type `fn(Vec2, f64) -> Vec2`
+   = note: expected fn pointer `fn(Vec2, Vec2) -> f64`
+              found fn pointer `fn(Vec2, f64) -> Vec2`
 
 error[E0053]: method `mul` has an incompatible type for trait
   --> $DIR/wrong-mul-method-signature.rs:52:5
@@ -22,9 +22,22 @@ error[E0053]: method `mul` has an incompatible type for trait
 LL |     fn mul(self, s: f64) -> f64 {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected i32, found f64
    |
-   = note: expected type `fn(Vec3, f64) -> i32`
-              found type `fn(Vec3, f64) -> f64`
+   = note: expected fn pointer `fn(Vec3, f64) -> i32`
+              found fn pointer `fn(Vec3, f64) -> f64`
 
-error: aborting due to 3 previous errors
+error[E0308]: mismatched types
+  --> $DIR/wrong-mul-method-signature.rs:63:45
+   |
+LL |     let x: Vec2 = Vec2 { x: 1.0, y: 2.0 } * 2.0; // trait had reversed order
+   |                                             ^^^ expected struct `Vec2`, found floating-point number
+
+error[E0308]: mismatched types
+  --> $DIR/wrong-mul-method-signature.rs:63:19
+   |
+LL |     let x: Vec2 = Vec2 { x: 1.0, y: 2.0 } * 2.0; // trait had reversed order
+   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `Vec2`, found f64
+
+error: aborting due to 5 previous errors
 
-For more information about this error, try `rustc --explain E0053`.
+Some errors have detailed explanations: E0053, E0308.
+For more information about an error, try `rustc --explain E0053`.