diff options
| author | Esteban Küber <esteban@kuber.com.ar> | 2019-11-14 23:45:30 -0800 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2019-11-18 11:03:03 -0800 |
| commit | 94c642546497dd4c04609bd6dbe7631fb56df1fa (patch) | |
| tree | deb8c44a34db3e9e6cfd3e421e83c5d7317cacab /src/test/ui/issues | |
| parent | b2e6aef0731990c98a6fb7ac6f890aa359a5e9e6 (diff) | |
| download | rust-94c642546497dd4c04609bd6dbe7631fb56df1fa.tar.gz rust-94c642546497dd4c04609bd6dbe7631fb56df1fa.zip | |
Remove E0308 note when primary label has all info
Diffstat (limited to 'src/test/ui/issues')
52 files changed, 15 insertions, 153 deletions
diff --git a/src/test/ui/issues/issue-11319.rs b/src/test/ui/issues/issue-11319.rs index 726c437355e..f40d0005161 100644 --- a/src/test/ui/issues/issue-11319.rs +++ b/src/test/ui/issues/issue-11319.rs @@ -8,7 +8,6 @@ fn main() { None => (), //~^ ERROR match arms have incompatible types //~| NOTE expected bool, found () - //~| NOTE expected type `bool` _ => true } } diff --git a/src/test/ui/issues/issue-11319.stderr b/src/test/ui/issues/issue-11319.stderr index 9abae68ed52..2ca49922d06 100644 --- a/src/test/ui/issues/issue-11319.stderr +++ b/src/test/ui/issues/issue-11319.stderr @@ -15,9 +15,6 @@ LL | | None => (), LL | | _ => true LL | | } | |_____- `match` arms have incompatible types - | - = note: expected type `bool` - found unit type `()` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-12997-2.stderr b/src/test/ui/issues/issue-12997-2.stderr index bac69075c83..102405cd0f6 100644 --- a/src/test/ui/issues/issue-12997-2.stderr +++ b/src/test/ui/issues/issue-12997-2.stderr @@ -2,10 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-12997-2.rs:8:1 | LL | fn bar(x: isize) { } - | ^^^^^^^^^^^^^^^^^^^^ expected isize, found mutable reference - | - = note: expected type `isize` - found mutable reference `&mut test::Bencher` + | ^^^^^^^^^^^^^^^^^^^^ expected isize, found &mut test::Bencher error: aborting due to previous error diff --git a/src/test/ui/issues/issue-13407.stderr b/src/test/ui/issues/issue-13407.stderr index 4c3e481564f..5a465cc533b 100644 --- a/src/test/ui/issues/issue-13407.stderr +++ b/src/test/ui/issues/issue-13407.stderr @@ -9,9 +9,6 @@ error[E0308]: mismatched types | LL | A::C = 1; | ^ expected struct `A::C`, found integer - | - = note: expected struct `A::C` - found type `{integer}` error[E0070]: invalid left-hand side expression --> $DIR/issue-13407.rs:6:5 diff --git a/src/test/ui/issues/issue-13446.stderr b/src/test/ui/issues/issue-13446.stderr index 80a32cd276a..13c35dd84f7 100644 --- a/src/test/ui/issues/issue-13446.stderr +++ b/src/test/ui/issues/issue-13446.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-13446.rs:3:26 | LL | static VEC: [u32; 256] = vec![]; - | ^^^^^^ expected array of 256 elements, found struct `std::vec::Vec` + | ^^^^^^ expected array `[u32; 256]`, found struct `std::vec::Vec` | = note: expected array `[u32; 256]` found struct `std::vec::Vec<_>` diff --git a/src/test/ui/issues/issue-14091.stderr b/src/test/ui/issues/issue-14091.stderr index 24a076624ed..bb9f843dadf 100644 --- a/src/test/ui/issues/issue-14091.stderr +++ b/src/test/ui/issues/issue-14091.stderr @@ -3,9 +3,6 @@ error[E0308]: mismatched types | LL | assert!(1,1); | ^^^^^^^^^^^^^ expected bool, found integer - | - = note: expected type `bool` - found type `{integer}` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-14541.rs b/src/test/ui/issues/issue-14541.rs index e8d44a4a9f8..555ec9f9868 100644 --- a/src/test/ui/issues/issue-14541.rs +++ b/src/test/ui/issues/issue-14541.rs @@ -5,8 +5,6 @@ fn make(v: Vec2) { let Vec3 { y: _, z: _ } = v; //~^ ERROR mismatched types //~| expected struct `Vec2`, found struct `Vec3` - //~| expected struct `Vec2` - //~| found struct `Vec3` } fn main() { } diff --git a/src/test/ui/issues/issue-14541.stderr b/src/test/ui/issues/issue-14541.stderr index e7cae883d6b..c5512e03007 100644 --- a/src/test/ui/issues/issue-14541.stderr +++ b/src/test/ui/issues/issue-14541.stderr @@ -3,9 +3,6 @@ error[E0308]: mismatched types | LL | let Vec3 { y: _, z: _ } = v; | ^^^^^^^^^^^^^^^^^^^ expected struct `Vec2`, found struct `Vec3` - | - = note: expected struct `Vec2` - found struct `Vec3` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-15783.rs b/src/test/ui/issues/issue-15783.rs index 61cb0093b1c..0c1db02a8e6 100644 --- a/src/test/ui/issues/issue-15783.rs +++ b/src/test/ui/issues/issue-15783.rs @@ -9,6 +9,6 @@ fn main() { //~^ ERROR mismatched types //~| expected enum `std::option::Option<&[&str]>` //~| found enum `std::option::Option<&[&str; 1]>` - //~| expected slice, found array of 1 element + //~| expected slice `[&str]`, found array `[&str; 1]` assert_eq!(msg, 3); } diff --git a/src/test/ui/issues/issue-15783.stderr b/src/test/ui/issues/issue-15783.stderr index f60655b7a34..74a96df5b1b 100644 --- a/src/test/ui/issues/issue-15783.stderr +++ b/src/test/ui/issues/issue-15783.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-15783.rs:8:19 | LL | let msg = foo(x); - | ^ expected slice, found array of 1 element + | ^ expected slice `[&str]`, found array `[&str; 1]` | = note: expected enum `std::option::Option<&[&str]>` found enum `std::option::Option<&[&str; 1]>` diff --git a/src/test/ui/issues/issue-15896.rs b/src/test/ui/issues/issue-15896.rs index 1a0a7b4b8e6..a11c9d07f6f 100644 --- a/src/test/ui/issues/issue-15896.rs +++ b/src/test/ui/issues/issue-15896.rs @@ -11,8 +11,6 @@ fn main() { Tau{t: x}, //~^ ERROR mismatched types //~| expected enum `main::R`, found struct `main::Tau` - //~| expected enum `main::R` - //~| found struct `main::Tau` _) => x, }; } diff --git a/src/test/ui/issues/issue-15896.stderr b/src/test/ui/issues/issue-15896.stderr index a8227bb19c2..f553be9df55 100644 --- a/src/test/ui/issues/issue-15896.stderr +++ b/src/test/ui/issues/issue-15896.stderr @@ -6,9 +6,6 @@ LL | let u = match e { LL | E::B( LL | Tau{t: x}, | ^^^^^^^^^ expected enum `main::R`, found struct `main::Tau` - | - = note: expected enum `main::R` - found struct `main::Tau` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-17033.rs b/src/test/ui/issues/issue-17033.rs index c330745bc07..715892397a4 100644 --- a/src/test/ui/issues/issue-17033.rs +++ b/src/test/ui/issues/issue-17033.rs @@ -1,7 +1,5 @@ fn f<'r>(p: &'r mut fn(p: &mut ())) { (*p)(()) //~ ERROR mismatched types - //~| expected mutable reference `&mut ()` - //~| found unit type `()` //~| expected &mut (), found () } diff --git a/src/test/ui/issues/issue-17033.stderr b/src/test/ui/issues/issue-17033.stderr index 37f817c2e9b..4bdc806f717 100644 --- a/src/test/ui/issues/issue-17033.stderr +++ b/src/test/ui/issues/issue-17033.stderr @@ -6,9 +6,6 @@ LL | (*p)(()) | | | expected &mut (), found () | help: consider mutably borrowing here: `&mut ()` - | - = note: expected mutable reference `&mut ()` - found unit type `()` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-19991.rs b/src/test/ui/issues/issue-19991.rs index 1d8128ffcb9..e79a006afd9 100644 --- a/src/test/ui/issues/issue-19991.rs +++ b/src/test/ui/issues/issue-19991.rs @@ -3,8 +3,6 @@ fn main() { if let Some(homura) = Some("madoka") { //~ ERROR missing an else clause - //~| expected unit type `()` - //~| found type `{integer}` //~| expected (), found integer 765 }; diff --git a/src/test/ui/issues/issue-19991.stderr b/src/test/ui/issues/issue-19991.stderr index c808680ce61..d06c3acfd12 100644 --- a/src/test/ui/issues/issue-19991.stderr +++ b/src/test/ui/issues/issue-19991.stderr @@ -3,15 +3,11 @@ error[E0317]: if may be missing an else clause | LL | / if let Some(homura) = Some("madoka") { LL | | -LL | | -LL | | LL | | 765 | | --- found here LL | | }; | |_____^ expected (), found integer | - = note: expected unit type `()` - found type `{integer}` = note: `if` expressions without `else` evaluate to `()` = help: consider adding an `else` block that evaluates to the expected type diff --git a/src/test/ui/issues/issue-20225.rs b/src/test/ui/issues/issue-20225.rs index b15f2a631fd..0c8e6e402e2 100644 --- a/src/test/ui/issues/issue-20225.rs +++ b/src/test/ui/issues/issue-20225.rs @@ -5,13 +5,11 @@ struct Foo; impl<'a, T> Fn<(&'a T,)> for Foo { extern "rust-call" fn call(&self, (_,): (T,)) {} //~^ ERROR: has an incompatible type for trait - //~| expected reference } impl<'a, T> FnMut<(&'a T,)> for Foo { extern "rust-call" fn call_mut(&mut self, (_,): (T,)) {} //~^ ERROR: has an incompatible type for trait - //~| expected reference } impl<'a, T> FnOnce<(&'a T,)> for Foo { @@ -19,7 +17,6 @@ impl<'a, T> FnOnce<(&'a T,)> for Foo { extern "rust-call" fn call_once(self, (_,): (T,)) {} //~^ ERROR: has an incompatible type for trait - //~| expected reference } fn main() {} diff --git a/src/test/ui/issues/issue-20225.stderr b/src/test/ui/issues/issue-20225.stderr index 63b0451e01a..baee8b96799 100644 --- a/src/test/ui/issues/issue-20225.stderr +++ b/src/test/ui/issues/issue-20225.stderr @@ -4,7 +4,7 @@ error[E0053]: method `call` has an incompatible type for trait LL | impl<'a, T> Fn<(&'a T,)> for Foo { | - this type parameter LL | extern "rust-call" fn call(&self, (_,): (T,)) {} - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected reference, found type parameter `T` + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected &T, found type parameter `T` | = note: expected fn pointer `extern "rust-call" fn(&Foo, (&'a T,))` found fn pointer `extern "rust-call" fn(&Foo, (T,))` @@ -12,12 +12,12 @@ LL | extern "rust-call" fn call(&self, (_,): (T,)) {} = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters error[E0053]: method `call_mut` has an incompatible type for trait - --> $DIR/issue-20225.rs:12:3 + --> $DIR/issue-20225.rs:11:3 | LL | impl<'a, T> FnMut<(&'a T,)> for Foo { | - this type parameter LL | extern "rust-call" fn call_mut(&mut self, (_,): (T,)) {} - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected reference, found type parameter `T` + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected &T, found type parameter `T` | = note: expected fn pointer `extern "rust-call" fn(&mut Foo, (&'a T,))` found fn pointer `extern "rust-call" fn(&mut Foo, (T,))` @@ -25,13 +25,13 @@ LL | extern "rust-call" fn call_mut(&mut self, (_,): (T,)) {} = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters error[E0053]: method `call_once` has an incompatible type for trait - --> $DIR/issue-20225.rs:20:3 + --> $DIR/issue-20225.rs:18:3 | LL | impl<'a, T> FnOnce<(&'a T,)> for Foo { | - this type parameter ... LL | extern "rust-call" fn call_once(self, (_,): (T,)) {} - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected reference, found type parameter `T` + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected &T, found type parameter `T` | = note: expected fn pointer `extern "rust-call" fn(Foo, (&'a T,))` found fn pointer `extern "rust-call" fn(Foo, (T,))` diff --git a/src/test/ui/issues/issue-22684.stderr b/src/test/ui/issues/issue-22684.stderr index 20a0d6f4103..3c6d3df7fae 100644 --- a/src/test/ui/issues/issue-22684.stderr +++ b/src/test/ui/issues/issue-22684.stderr @@ -3,9 +3,6 @@ error[E0308]: mismatched types | LL | let _: () = foo::Foo.bar(); | ^^^^^^^^^^^^^^ expected (), found bool - | - = note: expected unit type `()` - found type `bool` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-23589.stderr b/src/test/ui/issues/issue-23589.stderr index 8d58095ceff..a36b380b9c1 100644 --- a/src/test/ui/issues/issue-23589.stderr +++ b/src/test/ui/issues/issue-23589.stderr @@ -12,9 +12,6 @@ error[E0308]: mismatched types | LL | let v: Vec(&str) = vec!['1', '2']; | ^^^ expected &str, found char - | - = note: expected reference `&str` - found type `char` error: aborting due to 2 previous errors diff --git a/src/test/ui/issues/issue-27008.rs b/src/test/ui/issues/issue-27008.rs index 3b271a2a35b..1a08647358c 100644 --- a/src/test/ui/issues/issue-27008.rs +++ b/src/test/ui/issues/issue-27008.rs @@ -4,6 +4,4 @@ fn main() { let b = [0; S]; //~^ ERROR mismatched types //~| expected usize, found struct `S` - //~| expected type `usize` - //~| found struct `S` } diff --git a/src/test/ui/issues/issue-27008.stderr b/src/test/ui/issues/issue-27008.stderr index 598ee741a5c..2c9eed0b3a5 100644 --- a/src/test/ui/issues/issue-27008.stderr +++ b/src/test/ui/issues/issue-27008.stderr @@ -3,9 +3,6 @@ error[E0308]: mismatched types | LL | let b = [0; S]; | ^ expected usize, found struct `S` - | - = note: expected type `usize` - found struct `S` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-27042.stderr b/src/test/ui/issues/issue-27042.stderr index 4244f36e481..e379b23a595 100644 --- a/src/test/ui/issues/issue-27042.stderr +++ b/src/test/ui/issues/issue-27042.stderr @@ -16,9 +16,6 @@ LL | loop { break }; | | | expected i32, found () | help: give it a value of the expected type: `break 42` - | - = note: expected type `i32` - found unit type `()` error[E0308]: mismatched types --> $DIR/issue-27042.rs:8:9 @@ -27,9 +24,6 @@ LL | / 'b: LL | | LL | | while true { break }; // but here we cite the whole loop | |____________________________^ expected i32, found () - | - = note: expected type `i32` - found unit type `()` error[E0308]: mismatched types --> $DIR/issue-27042.rs:12:9 @@ -37,9 +31,6 @@ error[E0308]: mismatched types LL | / 'c: LL | | for _ in None { break }; // but here we cite the whole loop | |_______________________________^ expected i32, found () - | - = note: expected type `i32` - found unit type `()` error[E0308]: mismatched types --> $DIR/issue-27042.rs:15:9 @@ -47,9 +38,6 @@ error[E0308]: mismatched types LL | / 'd: LL | | while let Some(_) = None { break }; | |__________________________________________^ expected i32, found () - | - = note: expected type `i32` - found unit type `()` error: aborting due to 4 previous errors diff --git a/src/test/ui/issues/issue-29084.rs b/src/test/ui/issues/issue-29084.rs index 4710a594b31..c4c6b6f8183 100644 --- a/src/test/ui/issues/issue-29084.rs +++ b/src/test/ui/issues/issue-29084.rs @@ -4,8 +4,6 @@ macro_rules! foo { bar(&mut $d); //~^ ERROR mismatched types //~| expected u8, found &mut u8 - //~| expected type `u8` - //~| found mutable reference `&mut u8` }} } diff --git a/src/test/ui/issues/issue-29084.stderr b/src/test/ui/issues/issue-29084.stderr index 0a238761fc6..a91033e3360 100644 --- a/src/test/ui/issues/issue-29084.stderr +++ b/src/test/ui/issues/issue-29084.stderr @@ -6,9 +6,6 @@ LL | bar(&mut $d); ... LL | foo!(0u8); | ---------- in this macro invocation - | - = note: expected type `u8` - found mutable reference `&mut u8` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-30225.stderr b/src/test/ui/issues/issue-30225.stderr index 27a567548ba..ccd05fa6bfb 100644 --- a/src/test/ui/issues/issue-30225.stderr +++ b/src/test/ui/issues/issue-30225.stderr @@ -3,9 +3,6 @@ error[E0308]: mismatched types | LL | u = v; // mark $0 and $1 in a subtype relationship | ^ expected struct `A`, found struct `B` - | - = note: expected struct `A` - found struct `B` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-33504.stderr b/src/test/ui/issues/issue-33504.stderr index 758f86d3db8..522df6a07c2 100644 --- a/src/test/ui/issues/issue-33504.stderr +++ b/src/test/ui/issues/issue-33504.stderr @@ -3,9 +3,6 @@ error[E0308]: mismatched types | LL | let Test = 1; | ^^^^ expected integer, found struct `Test` - | - = note: expected type `{integer}` - found struct `Test` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-37026.stderr b/src/test/ui/issues/issue-37026.stderr index 00e44738742..5613d3f1766 100644 --- a/src/test/ui/issues/issue-37026.stderr +++ b/src/test/ui/issues/issue-37026.stderr @@ -3,18 +3,12 @@ error[E0308]: mismatched types | LL | let empty_struct::XEmpty2 = (); | ^^^^^^^^^^^^^^^^^^^^^ expected (), found struct `empty_struct::XEmpty2` - | - = note: expected unit type `()` - found struct `empty_struct::XEmpty2` error[E0308]: mismatched types --> $DIR/issue-37026.rs:7:9 | LL | let empty_struct::XEmpty6(..) = (); | ^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found struct `empty_struct::XEmpty6` - | - = note: expected unit type `()` - found struct `empty_struct::XEmpty6` error: aborting due to 2 previous errors diff --git a/src/test/ui/issues/issue-37665.stderr b/src/test/ui/issues/issue-37665.stderr index e7eef47fd29..f872557966b 100644 --- a/src/test/ui/issues/issue-37665.stderr +++ b/src/test/ui/issues/issue-37665.stderr @@ -3,9 +3,6 @@ error[E0308]: mismatched types | LL | let x: () = 0; | ^ expected (), found integer - | - = note: expected unit type `()` - found type `{integer}` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-39970.stderr b/src/test/ui/issues/issue-39970.stderr index 7cef2e6cd4c..b758cccd8f7 100644 --- a/src/test/ui/issues/issue-39970.stderr +++ b/src/test/ui/issues/issue-39970.stderr @@ -7,8 +7,6 @@ LL | fn visit() {} LL | <() as Visit>::visit(); | ^^^^^^^^^^^^^^^^^^^^ expected &(), found () | - = note: expected reference `&()` - found unit type `()` = note: required because of the requirements on the impl of `Visit` for `()` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-41549.stderr b/src/test/ui/issues/issue-41549.stderr index c2ffc2f4ac3..6d2ef769a16 100644 --- a/src/test/ui/issues/issue-41549.stderr +++ b/src/test/ui/issues/issue-41549.stderr @@ -3,9 +3,6 @@ error[E0326]: implemented const `CONST` has an incompatible type for trait | LL | const CONST: () = (); | ^^ expected u32, found () - | - = note: expected type `u32` - found unit type `()` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-41742.stderr b/src/test/ui/issues/issue-41742.stderr index a1dae867ae6..d6e2146208e 100644 --- a/src/test/ui/issues/issue-41742.stderr +++ b/src/test/ui/issues/issue-41742.stderr @@ -2,10 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-41742.rs:24:7 | LL | H["?"].f(); - | ^^^ expected u32, found reference - | - = note: expected type `u32` - found reference `&'static str` + | ^^^ expected u32, found &str error: aborting due to previous error diff --git a/src/test/ui/issues/issue-4201.rs b/src/test/ui/issues/issue-4201.rs index d4ac39526dd..ba4e9f6fa98 100644 --- a/src/test/ui/issues/issue-4201.rs +++ b/src/test/ui/issues/issue-4201.rs @@ -3,8 +3,6 @@ fn main() { 0 } else if false { //~^ ERROR if may be missing an else clause -//~| expected unit type `()` -//~| found type `{integer}` //~| expected (), found integer 1 }; diff --git a/src/test/ui/issues/issue-4201.stderr b/src/test/ui/issues/issue-4201.stderr index 8abb7c3c9f5..5ea4fdbf7ec 100644 --- a/src/test/ui/issues/issue-4201.stderr +++ b/src/test/ui/issues/issue-4201.stderr @@ -5,15 +5,11 @@ LL | } else if false { | ____________^ LL | | LL | | -LL | | -LL | | LL | | 1 | | - found here LL | | }; | |_____^ expected (), found integer | - = note: expected unit type `()` - found type `{integer}` = note: `if` expressions without `else` evaluate to `()` = help: consider adding an `else` block that evaluates to the expected type diff --git a/src/test/ui/issues/issue-43162.stderr b/src/test/ui/issues/issue-43162.stderr index 259b47ebe7c..76696873f4e 100644 --- a/src/test/ui/issues/issue-43162.stderr +++ b/src/test/ui/issues/issue-43162.stderr @@ -20,9 +20,6 @@ LL | fn foo() -> bool { LL | LL | break true; | - help: consider removing this semicolon - | - = note: expected type `bool` - found unit type `()` error: aborting due to 3 previous errors diff --git a/src/test/ui/issues/issue-43420-no-over-suggest.stderr b/src/test/ui/issues/issue-43420-no-over-suggest.stderr index 4d61788c347..27aebc548e1 100644 --- a/src/test/ui/issues/issue-43420-no-over-suggest.stderr +++ b/src/test/ui/issues/issue-43420-no-over-suggest.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-43420-no-over-suggest.rs:8:9 | LL | foo(&a); - | ^^ expected slice, found struct `std::vec::Vec` + | ^^ expected slice `[u16]`, found struct `std::vec::Vec` | = note: expected reference `&[u16]` found reference `&std::vec::Vec<u8>` diff --git a/src/test/ui/issues/issue-44023.stderr b/src/test/ui/issues/issue-44023.stderr index c7b5f7b2040..a55bb229869 100644 --- a/src/test/ui/issues/issue-44023.stderr +++ b/src/test/ui/issues/issue-44023.stderr @@ -5,9 +5,6 @@ LL | fn საჭმელად_გემრიელი_სადილი ( ) | ------------------------ ^^^^^ expected isize, found () | | | implicitly returns `()` as its body has no tail or `return` expression - | - = note: expected type `isize` - found unit type `()` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-4517.rs b/src/test/ui/issues/issue-4517.rs index 569fdc1662a..df3da04f2e8 100644 --- a/src/test/ui/issues/issue-4517.rs +++ b/src/test/ui/issues/issue-4517.rs @@ -4,7 +4,5 @@ fn main() { let foo: [u8; 4] = [1; 4]; bar(foo); //~^ ERROR mismatched types - //~| expected type `usize` - //~| found array `[u8; 4]` - //~| expected usize, found array of 4 elements + //~| expected usize, found array `[u8; 4]` } diff --git a/src/test/ui/issues/issue-4517.stderr b/src/test/ui/issues/issue-4517.stderr index 0f45e91d6f5..6c5495484b3 100644 --- a/src/test/ui/issues/issue-4517.stderr +++ b/src/test/ui/issues/issue-4517.stderr @@ -2,10 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-4517.rs:5:9 | LL | bar(foo); - | ^^^ expected usize, found array of 4 elements - | - = note: expected type `usize` - found array `[u8; 4]` + | ^^^ expected usize, found array `[u8; 4]` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-46302.stderr b/src/test/ui/issues/issue-46302.stderr index 221d4b6d67f..073abdfefdc 100644 --- a/src/test/ui/issues/issue-46302.stderr +++ b/src/test/ui/issues/issue-46302.stderr @@ -6,9 +6,6 @@ LL | let u: &str = if true { s[..2] } else { s }; | | | expected &str, found str | help: consider borrowing here: `&s[..2]` - | - = note: expected reference `&str` - found type `str` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr b/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr index dd6bef5c102..7e356ba1c11 100644 --- a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr +++ b/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr @@ -6,9 +6,6 @@ LL | light_flows_our_war_of_mocking_words(behold as usize); | | | expected &usize, found usize | help: consider borrowing here: `&(behold as usize)` - | - = note: expected reference `&usize` - found type `usize` error[E0308]: mismatched types --> $DIR/issue-46756-consider-borrowing-cast-or-binexpr.rs:14:42 @@ -18,9 +15,6 @@ LL | light_flows_our_war_of_mocking_words(with_tears + 4); | | | expected &usize, found usize | help: consider borrowing here: `&(with_tears + 4)` - | - = note: expected reference `&usize` - found type `usize` error: aborting due to 2 previous errors diff --git a/src/test/ui/issues/issue-47486.stderr b/src/test/ui/issues/issue-47486.stderr index 2b49c273330..9237b93924a 100644 --- a/src/test/ui/issues/issue-47486.stderr +++ b/src/test/ui/issues/issue-47486.stderr @@ -3,9 +3,6 @@ error[E0308]: mismatched types | LL | () < std::mem::size_of::<_>(); | ^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found usize - | - = note: expected unit type `()` - found type `usize` error[E0282]: type annotations needed --> $DIR/issue-47486.rs:3:11 diff --git a/src/test/ui/issues/issue-48364.stderr b/src/test/ui/issues/issue-48364.stderr index 4e4e0e7ed94..4fc534d59c8 100644 --- a/src/test/ui/issues/issue-48364.stderr +++ b/src/test/ui/issues/issue-48364.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-48364.rs:2:21 | LL | b"".starts_with(stringify!(foo)) - | ^^^^^^^^^^^^^^^ expected slice, found str + | ^^^^^^^^^^^^^^^ expected slice `[u8]`, found str | = note: expected reference `&[u8]` found reference `&'static str` diff --git a/src/test/ui/issues/issue-50577.stderr b/src/test/ui/issues/issue-50577.stderr index bcc2fc50099..2494bf7471b 100644 --- a/src/test/ui/issues/issue-50577.stderr +++ b/src/test/ui/issues/issue-50577.stderr @@ -31,8 +31,6 @@ LL | Drop = assert_eq!(1, 1) | expected (), found isize | found here | - = note: expected unit type `()` - found type `isize` = note: `if` expressions without `else` evaluate to `()` = help: consider adding an `else` block that evaluates to the expected type = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) diff --git a/src/test/ui/issues/issue-50585.stderr b/src/test/ui/issues/issue-50585.stderr index d2a21c48a09..9f60db91731 100644 --- a/src/test/ui/issues/issue-50585.stderr +++ b/src/test/ui/issues/issue-50585.stderr @@ -9,9 +9,6 @@ error[E0308]: mismatched types | LL | |y: Vec<[(); for x in 0..2 {}]>| {}; | ^^^^^^^^^^^^^^^^ expected usize, found () - | - = note: expected type `usize` - found unit type `()` error: aborting due to 2 previous errors diff --git a/src/test/ui/issues/issue-53348.rs b/src/test/ui/issues/issue-53348.rs index 83e5ddc4826..e453b0cfaa8 100644 --- a/src/test/ui/issues/issue-53348.rs +++ b/src/test/ui/issues/issue-53348.rs @@ -10,7 +10,6 @@ fn main() { a = *i.to_string(); //~^ ERROR mismatched types //~| NOTE expected struct `std::string::String`, found str - //~| NOTE expected struct v2.push(a); } } diff --git a/src/test/ui/issues/issue-53348.stderr b/src/test/ui/issues/issue-53348.stderr index 949d9a2f47d..2c117f52a26 100644 --- a/src/test/ui/issues/issue-53348.stderr +++ b/src/test/ui/issues/issue-53348.stderr @@ -3,9 +3,6 @@ error[E0308]: mismatched types | LL | a = *i.to_string(); | ^^^^^^^^^^^^^^ expected struct `std::string::String`, found str - | - = note: expected struct `std::string::String` - found type `str` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-53692.stderr b/src/test/ui/issues/issue-53692.stderr index e3f2cb8c410..8dc5c95b9b1 100644 --- a/src/test/ui/issues/issue-53692.stderr +++ b/src/test/ui/issues/issue-53692.stderr @@ -18,9 +18,6 @@ LL | let string: String = s.clone(); | | | expected struct `std::string::String`, found &str | help: try using a conversion method: `s.to_string()` - | - = note: expected struct `std::string::String` - found reference `&str` error: aborting due to 2 previous errors diff --git a/src/test/ui/issues/issue-56943.stderr b/src/test/ui/issues/issue-56943.stderr index fc6370b2d31..7fd124046dc 100644 --- a/src/test/ui/issues/issue-56943.stderr +++ b/src/test/ui/issues/issue-56943.stderr @@ -3,9 +3,6 @@ error[E0308]: mismatched types | LL | let _: issue_56943::S = issue_56943::S2; | ^^^^^^^^^^^^^^^ expected struct `issue_56943::S`, found struct `issue_56943::S2` - | - = note: expected struct `issue_56943::S` - found struct `issue_56943::S2` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-61106.stderr b/src/test/ui/issues/issue-61106.stderr index 8690ff4731f..c8439ee18f4 100644 --- a/src/test/ui/issues/issue-61106.stderr +++ b/src/test/ui/issues/issue-61106.stderr @@ -6,9 +6,6 @@ LL | foo(x.clone()); | | | expected &str, found struct `std::string::String` | help: consider borrowing here: `&x` - | - = note: expected reference `&str` - found struct `std::string::String` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-61882.stderr b/src/test/ui/issues/issue-61882.stderr index dbdb14d7160..86cc48aff06 100644 --- a/src/test/ui/issues/issue-61882.stderr +++ b/src/test/ui/issues/issue-61882.stderr @@ -3,9 +3,6 @@ error[E0308]: mismatched types | LL | const B: A<u8> = Self(0); | ^ expected bool, found integer - | - = note: expected type `bool` - found type `{integer}` error[E0308]: mismatched types --> $DIR/issue-61882.rs:4:22 diff --git a/src/test/ui/issues/issue-7061.stderr b/src/test/ui/issues/issue-7061.stderr index 223cc48c7dd..b498ff0b534 100644 --- a/src/test/ui/issues/issue-7061.stderr +++ b/src/test/ui/issues/issue-7061.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-7061.rs:4:46 | LL | fn foo(&'a mut self) -> Box<BarStruct> { self } - | -------------- ^^^^ expected struct `std::boxed::Box`, found mutable reference + | -------------- ^^^^ expected struct `std::boxed::Box`, found &mut BarStruct | | | expected `std::boxed::Box<BarStruct>` because of return type | |