2adaa5dae2
This commit can be replicated by running
`cargo update -p rustfix --precise 0.8.7 && x test ui --bless`.
---
The reasons this affects UI tests is as follows:
- The UI test suite runs rustc with
`-Z deduplicate-diagnostics=no --error-format=json`,
which means that rustc emits multiple errors containing identical
suggestions. That caused the weird-looking code that had multiple `X: Copy` suggestions.
- Those suggestions are interpreted not by rustc itself, but by the
`rustfix` library, maintained by cargo but published as a separate
crates.io library and used by compiletest.
- Sometime between rustfix 0.8.1 and 0.8.7 (probably in cargo 14747, but
it's hard to tell because rustfix's versioning doesn't match cargo's),
rustfix got smarter and stopped applying duplicate suggestions.
Update rustfix to match cargo's behavior. Ideally, we would always share
a version of rustfix between cargo and rustc (perhaps with a path
dependency?), to make sure we are testing the behavior we ship. But for
now, just manually update it to match.
Note that the latest version of rustfix published to crates.io is 0.9.1,
not 0.8.7. But 0.9.1 is not the version used in cargo, which is 0.9.3.
Rather than trying to match versions exactly, I just updated rustfix to
the latest in the 0.8 branch.
89 lines
2.4 KiB
Rust
89 lines
2.4 KiB
Rust
//@ run-rustfix
|
|
//@ rustfix-only-machine-applicable
|
|
#![allow(unused_variables)]
|
|
#![allow(dead_code)]
|
|
#![allow(unused_must_use)]
|
|
|
|
fn foo() -> i32 {
|
|
({2}) + {2} //~ ERROR expected expression, found `+`
|
|
//~^ ERROR mismatched types
|
|
}
|
|
|
|
fn bar() -> i32 {
|
|
({2}) + 2 //~ ERROR leading `+` is not supported
|
|
//~^ ERROR mismatched types
|
|
}
|
|
|
|
fn zul() -> u32 {
|
|
let foo = 3;
|
|
({ 42 }) + foo; //~ ERROR expected expression, found `+`
|
|
//~^ ERROR mismatched types
|
|
32
|
|
}
|
|
|
|
fn baz() -> i32 {
|
|
({ 3 }) * 3 //~ ERROR type `{integer}` cannot be dereferenced
|
|
//~^ ERROR mismatched types
|
|
}
|
|
|
|
fn moo(x: u32) -> bool {
|
|
(match x {
|
|
_ => 1,
|
|
}) > 0 //~ ERROR expected expression
|
|
}
|
|
|
|
fn qux() -> u32 {
|
|
({2}) - 2 //~ ERROR cannot apply unary operator `-` to type `u32`
|
|
//~^ ERROR mismatched types
|
|
}
|
|
|
|
fn space_cadet() -> bool {
|
|
({ true }) | { true } //~ ERROR E0308
|
|
//~^ ERROR expected parameter name
|
|
}
|
|
|
|
fn revenge_from_mars() -> bool {
|
|
({ true }) && { true } //~ ERROR E0308
|
|
//~^ ERROR mismatched types
|
|
}
|
|
|
|
fn attack_from_mars() -> bool {
|
|
({ true }) || { true } //~ ERROR E0308
|
|
//~^ ERROR mismatched types
|
|
}
|
|
|
|
// This gets corrected by adding a semicolon, instead of parens.
|
|
// It's placed here to help keep track of the way this diagnostic
|
|
// needs to interact with type checking to avoid MachineApplicable
|
|
// suggestions that actually break stuff.
|
|
//
|
|
// If you're wondering what happens if that `foo()` is a `true` like
|
|
// all the ones above use? Nothing. It makes neither suggestion in
|
|
// that case.
|
|
fn asteroids() -> impl FnOnce() -> bool {
|
|
{ foo(); } || { true } //~ ERROR E0308
|
|
}
|
|
|
|
// https://github.com/rust-lang/rust/issues/105179
|
|
fn r#match() -> i32 {
|
|
(match () { () => 1 }) + match () { () => 1 } //~ ERROR expected expression, found `+`
|
|
//~^ ERROR mismatched types
|
|
}
|
|
|
|
// https://github.com/rust-lang/rust/issues/102171
|
|
fn r#unsafe() -> i32 {
|
|
(unsafe { 1 }) + unsafe { 1 } //~ ERROR expected expression, found `+`
|
|
//~^ ERROR mismatched types
|
|
}
|
|
|
|
// https://github.com/rust-lang/rust/issues/88727
|
|
fn matches() -> bool {
|
|
(match () { _ => true }) && match () { _ => true }; //~ ERROR mismatched types
|
|
(match () { _ => true }) && match () { _ => true }; //~ ERROR mismatched types
|
|
//~^ ERROR expected `;`, found keyword `match`
|
|
(match () { _ => true }) && true; //~ ERROR mismatched types
|
|
(match () { _ => true }) && true //~ ERROR mismatched types
|
|
//~^ ERROR mismatched types
|
|
}
|
|
fn main() {}
|