From 3bd46f1aecbcd3b7e57bd78c4dda72c076368f1f Mon Sep 17 00:00:00 2001 From: LeSeulArtichaut Date: Tue, 10 Dec 2019 22:03:13 +0100 Subject: [PATCH] Update UI test expectations --- src/test/ui/autoderef-full-lval.stderr | 4 +-- src/test/ui/binary-op-on-double-ref.stderr | 2 +- src/test/ui/binop/binop-bitxor-str.stderr | 2 +- src/test/ui/binop/binop-mul-bool.stderr | 2 +- src/test/ui/binop/binop-typeck.stderr | 2 +- src/test/ui/for/for-loop-type-error.stderr | 2 +- src/test/ui/issues/issue-14915.stderr | 2 +- src/test/ui/issues/issue-24363.stderr | 2 +- src/test/ui/issues/issue-28837.stderr | 18 ++++++------- src/test/ui/issues/issue-31076.stderr | 4 +-- src/test/ui/issues/issue-35668.stderr | 2 +- src/test/ui/issues/issue-3820.stderr | 2 +- src/test/ui/issues/issue-40610.stderr | 2 +- src/test/ui/issues/issue-41394.stderr | 2 +- src/test/ui/issues/issue-47377.stderr | 2 +- src/test/ui/issues/issue-47380.stderr | 2 +- .../or-patterns-syntactic-fail.stderr | 2 +- src/test/ui/pattern/pattern-tyvar-2.stderr | 2 +- src/test/ui/span/issue-39018.stderr | 26 +++++++++---------- .../ui/str/str-concat-on-double-ref.stderr | 2 +- ...non-1-width-unicode-multiline-label.stderr | 2 +- .../trait-resolution-in-overloaded-op.stderr | 2 +- .../type/type-check/missing_trait_impl.stderr | 2 +- src/test/ui/vec/vec-res-add.stderr | 2 +- 24 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/test/ui/autoderef-full-lval.stderr b/src/test/ui/autoderef-full-lval.stderr index c9f3e8b2e26c..e2870ef8062d 100644 --- a/src/test/ui/autoderef-full-lval.stderr +++ b/src/test/ui/autoderef-full-lval.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `std::boxed::Box` +error[E0369]: cannot add `std::boxed::Box` to `std::boxed::Box` --> $DIR/autoderef-full-lval.rs:15:24 | LL | let z: isize = a.x + b.y; @@ -8,7 +8,7 @@ LL | let z: isize = a.x + b.y; | = note: an implementation of `std::ops::Add` might be missing for `std::boxed::Box` -error[E0369]: binary operation `+` cannot be applied to type `std::boxed::Box` +error[E0369]: cannot add `std::boxed::Box` to `std::boxed::Box` --> $DIR/autoderef-full-lval.rs:21:33 | LL | let answer: isize = forty.a + two.a; diff --git a/src/test/ui/binary-op-on-double-ref.stderr b/src/test/ui/binary-op-on-double-ref.stderr index d036f06a8c7d..6c405333ec68 100644 --- a/src/test/ui/binary-op-on-double-ref.stderr +++ b/src/test/ui/binary-op-on-double-ref.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `%` cannot be applied to type `&&{integer}` +error[E0369]: cannot mod `&&{integer}` by `{integer}` --> $DIR/binary-op-on-double-ref.rs:4:11 | LL | x % 2 == 0 diff --git a/src/test/ui/binop/binop-bitxor-str.stderr b/src/test/ui/binop/binop-bitxor-str.stderr index 9e8992235edd..9a0d301d8635 100644 --- a/src/test/ui/binop/binop-bitxor-str.stderr +++ b/src/test/ui/binop/binop-bitxor-str.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `^` cannot be applied to type `std::string::String` +error[E0369]: no implementation for `std::string::String ^ std::string::String` --> $DIR/binop-bitxor-str.rs:3:37 | LL | fn main() { let x = "a".to_string() ^ "b".to_string(); } diff --git a/src/test/ui/binop/binop-mul-bool.stderr b/src/test/ui/binop/binop-mul-bool.stderr index 92e14bccccd5..ade220255893 100644 --- a/src/test/ui/binop/binop-mul-bool.stderr +++ b/src/test/ui/binop/binop-mul-bool.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `*` cannot be applied to type `bool` +error[E0369]: cannot multiply `bool` to `bool` --> $DIR/binop-mul-bool.rs:3:26 | LL | fn main() { let x = true * false; } diff --git a/src/test/ui/binop/binop-typeck.stderr b/src/test/ui/binop/binop-typeck.stderr index d33cff313e7f..ebf82079ef2e 100644 --- a/src/test/ui/binop/binop-typeck.stderr +++ b/src/test/ui/binop/binop-typeck.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `bool` +error[E0369]: cannot add `{integer}` to `bool` --> $DIR/binop-typeck.rs:6:15 | LL | let z = x + y; diff --git a/src/test/ui/for/for-loop-type-error.stderr b/src/test/ui/for/for-loop-type-error.stderr index 588e7a0ed339..0ed26384f406 100644 --- a/src/test/ui/for/for-loop-type-error.stderr +++ b/src/test/ui/for/for-loop-type-error.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `()` +error[E0369]: cannot add `()` to `()` --> $DIR/for-loop-type-error.rs:2:16 | LL | let x = () + (); diff --git a/src/test/ui/issues/issue-14915.stderr b/src/test/ui/issues/issue-14915.stderr index e8de44320da9..00b9909af597 100644 --- a/src/test/ui/issues/issue-14915.stderr +++ b/src/test/ui/issues/issue-14915.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `std::boxed::Box` +error[E0369]: cannot add `{integer}` to `std::boxed::Box` --> $DIR/issue-14915.rs:6:22 | LL | println!("{}", x + 1); diff --git a/src/test/ui/issues/issue-24363.stderr b/src/test/ui/issues/issue-24363.stderr index 50d65e09bb1c..a60fb24ec120 100644 --- a/src/test/ui/issues/issue-24363.stderr +++ b/src/test/ui/issues/issue-24363.stderr @@ -4,7 +4,7 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields LL | 1.create_a_type_error[ | ^^^^^^^^^^^^^^^^^^^ -error[E0369]: binary operation `+` cannot be applied to type `()` +error[E0369]: cannot add `()` to `()` --> $DIR/issue-24363.rs:3:11 | LL | ()+() diff --git a/src/test/ui/issues/issue-28837.stderr b/src/test/ui/issues/issue-28837.stderr index ac2a9f2203d5..92470f89805f 100644 --- a/src/test/ui/issues/issue-28837.stderr +++ b/src/test/ui/issues/issue-28837.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `A` +error[E0369]: cannot add `A` to `A` --> $DIR/issue-28837.rs:6:7 | LL | a + a; @@ -8,7 +8,7 @@ LL | a + a; | = note: an implementation of `std::ops::Add` might be missing for `A` -error[E0369]: binary operation `-` cannot be applied to type `A` +error[E0369]: cannot substract `A` from `A` --> $DIR/issue-28837.rs:8:7 | LL | a - a; @@ -18,7 +18,7 @@ LL | a - a; | = note: an implementation of `std::ops::Sub` might be missing for `A` -error[E0369]: binary operation `*` cannot be applied to type `A` +error[E0369]: cannot multiply `A` to `A` --> $DIR/issue-28837.rs:10:7 | LL | a * a; @@ -28,7 +28,7 @@ LL | a * a; | = note: an implementation of `std::ops::Mul` might be missing for `A` -error[E0369]: binary operation `/` cannot be applied to type `A` +error[E0369]: cannot divide `A` by `A` --> $DIR/issue-28837.rs:12:7 | LL | a / a; @@ -38,7 +38,7 @@ LL | a / a; | = note: an implementation of `std::ops::Div` might be missing for `A` -error[E0369]: binary operation `%` cannot be applied to type `A` +error[E0369]: cannot mod `A` by `A` --> $DIR/issue-28837.rs:14:7 | LL | a % a; @@ -48,7 +48,7 @@ LL | a % a; | = note: an implementation of `std::ops::Rem` might be missing for `A` -error[E0369]: binary operation `&` cannot be applied to type `A` +error[E0369]: no implementation for `A & A` --> $DIR/issue-28837.rs:16:7 | LL | a & a; @@ -58,7 +58,7 @@ LL | a & a; | = note: an implementation of `std::ops::BitAnd` might be missing for `A` -error[E0369]: binary operation `|` cannot be applied to type `A` +error[E0369]: no implementation for `A | A` --> $DIR/issue-28837.rs:18:7 | LL | a | a; @@ -68,7 +68,7 @@ LL | a | a; | = note: an implementation of `std::ops::BitOr` might be missing for `A` -error[E0369]: binary operation `<<` cannot be applied to type `A` +error[E0369]: no implementation for `A << A --> $DIR/issue-28837.rs:20:7 | LL | a << a; @@ -78,7 +78,7 @@ LL | a << a; | = note: an implementation of `std::ops::Shl` might be missing for `A` -error[E0369]: binary operation `>>` cannot be applied to type `A` +error[E0369]: no implementation for `A >> A --> $DIR/issue-28837.rs:22:7 | LL | a >> a; diff --git a/src/test/ui/issues/issue-31076.stderr b/src/test/ui/issues/issue-31076.stderr index 60a3be1c36b7..5d65734cd230 100644 --- a/src/test/ui/issues/issue-31076.stderr +++ b/src/test/ui/issues/issue-31076.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `{integer}` +error[E0369]: cannot add `{integer}` to `{integer}` --> $DIR/issue-31076.rs:13:15 | LL | let x = 5 + 6; @@ -8,7 +8,7 @@ LL | let x = 5 + 6; | = note: an implementation of `std::ops::Add` might be missing for `{integer}` -error[E0369]: binary operation `+` cannot be applied to type `i32` +error[E0369]: cannot add `i32` to `i32` --> $DIR/issue-31076.rs:15:18 | LL | let y = 5i32 + 6i32; diff --git a/src/test/ui/issues/issue-35668.stderr b/src/test/ui/issues/issue-35668.stderr index 59ca874bd201..9d5796a5eefe 100644 --- a/src/test/ui/issues/issue-35668.stderr +++ b/src/test/ui/issues/issue-35668.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `*` cannot be applied to type `&T` +error[E0369]: cannot multiply `&T` to `&T` --> $DIR/issue-35668.rs:2:23 | LL | a.iter().map(|a| a*a) diff --git a/src/test/ui/issues/issue-3820.stderr b/src/test/ui/issues/issue-3820.stderr index 35eceb3b3c63..8cc768237a94 100644 --- a/src/test/ui/issues/issue-3820.stderr +++ b/src/test/ui/issues/issue-3820.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `*` cannot be applied to type `Thing` +error[E0369]: cannot multiply `{integer}` to `Thing` --> $DIR/issue-3820.rs:14:15 | LL | let w = u * 3; diff --git a/src/test/ui/issues/issue-40610.stderr b/src/test/ui/issues/issue-40610.stderr index 9d5775919296..95f45c168e12 100644 --- a/src/test/ui/issues/issue-40610.stderr +++ b/src/test/ui/issues/issue-40610.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `()` +error[E0369]: cannot add `()` to `()` --> $DIR/issue-40610.rs:4:8 | LL | () + f(&[1.0]); diff --git a/src/test/ui/issues/issue-41394.stderr b/src/test/ui/issues/issue-41394.stderr index c8437ab189d8..3f60ea4bbf73 100644 --- a/src/test/ui/issues/issue-41394.stderr +++ b/src/test/ui/issues/issue-41394.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `&str` +error[E0369]: cannot add `{integer}` to `&str` --> $DIR/issue-41394.rs:2:12 | LL | A = "" + 1 diff --git a/src/test/ui/issues/issue-47377.stderr b/src/test/ui/issues/issue-47377.stderr index 3460c1dae229..5f785679c558 100644 --- a/src/test/ui/issues/issue-47377.stderr +++ b/src/test/ui/issues/issue-47377.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `&str` +error[E0369]: cannot add `&str` to `&str` --> $DIR/issue-47377.rs:4:14 | LL | let _a = b + ", World!"; diff --git a/src/test/ui/issues/issue-47380.stderr b/src/test/ui/issues/issue-47380.stderr index f334dcbd916a..216e32ddae41 100644 --- a/src/test/ui/issues/issue-47380.stderr +++ b/src/test/ui/issues/issue-47380.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `&str` +error[E0369]: cannot add `&str` to `&str` --> $DIR/issue-47380.rs:3:35 | LL | println!("๐Ÿฆ€๐Ÿฆ€๐Ÿฆ€๐Ÿฆ€๐Ÿฆ€"); let _a = b + ", World!"; diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr b/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr index b6ff39d64d6d..e77d92e8b07d 100644 --- a/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr +++ b/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr @@ -104,7 +104,7 @@ LL | #![feature(or_patterns)] | = note: `#[warn(incomplete_features)]` on by default -error[E0369]: binary operation `|` cannot be applied to type `E` +error[E0369]: no implementation for `E | ()` --> $DIR/or-patterns-syntactic-fail.rs:24:22 | LL | let _ = |A | B: E| (); diff --git a/src/test/ui/pattern/pattern-tyvar-2.stderr b/src/test/ui/pattern/pattern-tyvar-2.stderr index 7c6ae499cbb0..bb3e61017d48 100644 --- a/src/test/ui/pattern/pattern-tyvar-2.stderr +++ b/src/test/ui/pattern/pattern-tyvar-2.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `*` cannot be applied to type `std::vec::Vec` +error[E0369]: cannot multiply `{integer}` to `std::vec::Vec` --> $DIR/pattern-tyvar-2.rs:3:71 | LL | fn foo(t: Bar) -> isize { match t { Bar::T1(_, Some(x)) => { return x * 3; } _ => { panic!(); } } } diff --git a/src/test/ui/span/issue-39018.stderr b/src/test/ui/span/issue-39018.stderr index 9637d1d82ec7..8a32561bd01d 100644 --- a/src/test/ui/span/issue-39018.stderr +++ b/src/test/ui/span/issue-39018.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `&str` +error[E0369]: cannot add `&str` to `&str` --> $DIR/issue-39018.rs:2:22 | LL | let x = "Hello " + "World!"; @@ -12,7 +12,7 @@ help: `to_owned()` can be used to create an owned `String` from a string referen LL | let x = "Hello ".to_owned() + "World!"; | ^^^^^^^^^^^^^^^^^^^ -error[E0369]: binary operation `+` cannot be applied to type `World` +error[E0369]: cannot add `World` to `World` --> $DIR/issue-39018.rs:8:26 | LL | let y = World::Hello + World::Goodbye; @@ -22,7 +22,7 @@ LL | let y = World::Hello + World::Goodbye; | = note: an implementation of `std::ops::Add` might be missing for `World` -error[E0369]: binary operation `+` cannot be applied to type `&str` +error[E0369]: cannot add `std::string::String` to `&str` --> $DIR/issue-39018.rs:11:22 | LL | let x = "Hello " + "World!".to_owned(); @@ -36,7 +36,7 @@ help: `to_owned()` can be used to create an owned `String` from a string referen LL | let x = "Hello ".to_owned() + &"World!".to_owned(); | ^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^ -error[E0369]: binary operation `+` cannot be applied to type `&std::string::String` +error[E0369]: cannot add `&std::string::String` to `&std::string::String` --> $DIR/issue-39018.rs:26:16 | LL | let _ = &a + &b; @@ -50,7 +50,7 @@ help: String concatenation appends the string on the right to the string on the LL | let _ = a + &b; | ^ -error[E0369]: binary operation `+` cannot be applied to type `&std::string::String` +error[E0369]: cannot add `std::string::String` to `&std::string::String` --> $DIR/issue-39018.rs:27:16 | LL | let _ = &a + b; @@ -73,7 +73,7 @@ LL | let _ = a + b; | expected `&str`, found struct `std::string::String` | help: consider borrowing here: `&b` -error[E0369]: binary operation `+` cannot be applied to type `&std::string::String` +error[E0369]: cannot add `std::string::String` to `&std::string::String` --> $DIR/issue-39018.rs:30:15 | LL | let _ = e + b; @@ -87,7 +87,7 @@ help: `to_owned()` can be used to create an owned `String` from a string referen LL | let _ = e.to_owned() + &b; | ^^^^^^^^^^^^ ^^ -error[E0369]: binary operation `+` cannot be applied to type `&std::string::String` +error[E0369]: cannot add `&std::string::String` to `&std::string::String` --> $DIR/issue-39018.rs:31:15 | LL | let _ = e + &b; @@ -101,7 +101,7 @@ help: `to_owned()` can be used to create an owned `String` from a string referen LL | let _ = e.to_owned() + &b; | ^^^^^^^^^^^^ -error[E0369]: binary operation `+` cannot be applied to type `&std::string::String` +error[E0369]: cannot add `&str` to `&std::string::String` --> $DIR/issue-39018.rs:32:15 | LL | let _ = e + d; @@ -115,7 +115,7 @@ help: `to_owned()` can be used to create an owned `String` from a string referen LL | let _ = e.to_owned() + d; | ^^^^^^^^^^^^ -error[E0369]: binary operation `+` cannot be applied to type `&std::string::String` +error[E0369]: cannot add `&&str` to `&std::string::String` --> $DIR/issue-39018.rs:33:15 | LL | let _ = e + &d; @@ -129,7 +129,7 @@ help: `to_owned()` can be used to create an owned `String` from a string referen LL | let _ = e.to_owned() + &d; | ^^^^^^^^^^^^ -error[E0369]: binary operation `+` cannot be applied to type `&&str` +error[E0369]: cannot add `&&str` to `&&str` --> $DIR/issue-39018.rs:34:16 | LL | let _ = &c + &d; @@ -139,7 +139,7 @@ LL | let _ = &c + &d; | = note: an implementation of `std::ops::Add` might be missing for `&&str` -error[E0369]: binary operation `+` cannot be applied to type `&&str` +error[E0369]: cannot add `&str` to `&&str` --> $DIR/issue-39018.rs:35:16 | LL | let _ = &c + d; @@ -149,7 +149,7 @@ LL | let _ = &c + d; | = note: an implementation of `std::ops::Add` might be missing for `&&str` -error[E0369]: binary operation `+` cannot be applied to type `&str` +error[E0369]: cannot add `&&str` to `&str` --> $DIR/issue-39018.rs:36:15 | LL | let _ = c + &d; @@ -163,7 +163,7 @@ help: `to_owned()` can be used to create an owned `String` from a string referen LL | let _ = c.to_owned() + &d; | ^^^^^^^^^^^^ -error[E0369]: binary operation `+` cannot be applied to type `&str` +error[E0369]: cannot add `&str` to `&str` --> $DIR/issue-39018.rs:37:15 | LL | let _ = c + d; diff --git a/src/test/ui/str/str-concat-on-double-ref.stderr b/src/test/ui/str/str-concat-on-double-ref.stderr index d193955af4ba..d77e0d8f242d 100644 --- a/src/test/ui/str/str-concat-on-double-ref.stderr +++ b/src/test/ui/str/str-concat-on-double-ref.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `&std::string::String` +error[E0369]: cannot add `&str` to `&std::string::String` --> $DIR/str-concat-on-double-ref.rs:4:15 | LL | let c = a + b; diff --git a/src/test/ui/terminal-width/non-1-width-unicode-multiline-label.stderr b/src/test/ui/terminal-width/non-1-width-unicode-multiline-label.stderr index 9f0f990670f2..69daa93412a3 100644 --- a/src/test/ui/terminal-width/non-1-width-unicode-multiline-label.stderr +++ b/src/test/ui/terminal-width/non-1-width-unicode-multiline-label.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `&str` +error[E0369]: cannot add `&str` to `&str` --> $DIR/non-1-width-unicode-multiline-label.rs:5:260 | LL | ...เฝฝเฝพเฝฟเพ€เพเพ‚เพƒเพ„เพ…เพ†เพ‡เพˆเพ‰เพŠเพ‹เพŒเพเพŽเพเพเพ‘เพ’เพ“เพ”เพ•เพ–เพ—เพ˜เพ™เพšเพ›เพœเพเพžเพŸเพ เพกเพขเพฃเพคเพฅเพฆเพงเพจเพฉเพชเพซเพฌเพญเพฎเพฏเพฐเพฑเพฒเพณเพดเพตเพถเพทเพธเพนเพบเพปเพผเพฝเพพเพฟเฟ€เฟเฟ‚เฟƒเฟ„เฟ…เฟ†เฟ‡...เฟ‹เฟŒเฟเฟŽเฟเฟเฟ‘เฟ’เฟ“เฟ”เฟ•เฟ–เฟ—เฟ˜เฟ™เฟš"; let _a = unicode_is_fun + " really fun!"; diff --git a/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr b/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr index d11562e2a001..8d7ba36c665b 100644 --- a/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr +++ b/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `*` cannot be applied to type `&T` +error[E0369]: cannot multiply `f64` to `&T` --> $DIR/trait-resolution-in-overloaded-op.rs:8:7 | LL | a * b diff --git a/src/test/ui/type/type-check/missing_trait_impl.stderr b/src/test/ui/type/type-check/missing_trait_impl.stderr index 2a158ab8564f..7186d6a542dc 100644 --- a/src/test/ui/type/type-check/missing_trait_impl.stderr +++ b/src/test/ui/type/type-check/missing_trait_impl.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `T` +error[E0369]: cannot add `T` to `T` --> $DIR/missing_trait_impl.rs:5:15 | LL | let z = x + y; diff --git a/src/test/ui/vec/vec-res-add.stderr b/src/test/ui/vec/vec-res-add.stderr index 78b70f09e900..1cc12a222e50 100644 --- a/src/test/ui/vec/vec-res-add.stderr +++ b/src/test/ui/vec/vec-res-add.stderr @@ -1,4 +1,4 @@ -error[E0369]: binary operation `+` cannot be applied to type `std::vec::Vec` +error[E0369]: cannot add `std::vec::Vec` to `std::vec::Vec` --> $DIR/vec-res-add.rs:16:15 | LL | let k = i + j;