From f0830c0ade39c76142118fc6f8fe7375173af7c7 Mon Sep 17 00:00:00 2001 From: CastilloDel Date: Mon, 6 Feb 2023 15:33:54 +0100 Subject: [PATCH] Add `run-rustfix` to tests/ui/issues/issue-92741.rs --- src/tools/tidy/src/ui_tests.rs | 2 +- tests/ui/issues/issue-92741.fixed | 13 +++++++++++++ tests/ui/issues/issue-92741.rs | 13 +++++++------ tests/ui/issues/issue-92741.stderr | 18 +++++++++--------- 4 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 tests/ui/issues/issue-92741.fixed diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index ba20c77a7d1..83551a1d820 100644 --- a/src/tools/tidy/src/ui_tests.rs +++ b/src/tools/tidy/src/ui_tests.rs @@ -10,7 +10,7 @@ const ENTRY_LIMIT: usize = 1000; // FIXME: The following limits should be reduced eventually. const ROOT_ENTRY_LIMIT: usize = 939; -const ISSUES_ENTRY_LIMIT: usize = 2000; +const ISSUES_ENTRY_LIMIT: usize = 2001; fn check_entries(path: &Path, bad: &mut bool) { for dir in Walk::new(&path.join("ui")) { diff --git a/tests/ui/issues/issue-92741.fixed b/tests/ui/issues/issue-92741.fixed new file mode 100644 index 00000000000..d07aeb6c029 --- /dev/null +++ b/tests/ui/issues/issue-92741.fixed @@ -0,0 +1,13 @@ +// run-rustfix +fn main() {} +fn _foo() -> bool { + if true { true } else { false } +} + +fn _bar() -> bool { + if true { true } else { false } +} + +fn _baz() -> bool { + if true { true } else { false } +} diff --git a/tests/ui/issues/issue-92741.rs b/tests/ui/issues/issue-92741.rs index 4e18918c1cf..413d5bf0478 100644 --- a/tests/ui/issues/issue-92741.rs +++ b/tests/ui/issues/issue-92741.rs @@ -1,16 +1,17 @@ +// run-rustfix fn main() {} -fn foo() -> bool { - & //~ ERROR 3:5: 5:36: mismatched types [E0308] +fn _foo() -> bool { + & //~ ERROR 4:5: 6:36: mismatched types [E0308] mut if true { true } else { false } } -fn bar() -> bool { - & //~ ERROR 9:5: 10:40: mismatched types [E0308] +fn _bar() -> bool { + & //~ ERROR 10:5: 11:40: mismatched types [E0308] mut if true { true } else { false } } -fn baz() -> bool { - & mut //~ ERROR 14:5: 15:36: mismatched types [E0308] +fn _baz() -> bool { + & mut //~ ERROR 15:5: 16:36: mismatched types [E0308] if true { true } else { false } } diff --git a/tests/ui/issues/issue-92741.stderr b/tests/ui/issues/issue-92741.stderr index 7716a10cde0..49315e7a8bf 100644 --- a/tests/ui/issues/issue-92741.stderr +++ b/tests/ui/issues/issue-92741.stderr @@ -1,8 +1,8 @@ error[E0308]: mismatched types - --> $DIR/issue-92741.rs:3:5 + --> $DIR/issue-92741.rs:4:5 | -LL | fn foo() -> bool { - | ---- expected `bool` because of return type +LL | fn _foo() -> bool { + | ---- expected `bool` because of return type LL | / & LL | | mut LL | | if true { true } else { false } @@ -15,10 +15,10 @@ LL - mut | error[E0308]: mismatched types - --> $DIR/issue-92741.rs:9:5 + --> $DIR/issue-92741.rs:10:5 | -LL | fn bar() -> bool { - | ---- expected `bool` because of return type +LL | fn _bar() -> bool { + | ---- expected `bool` because of return type LL | / & LL | | mut if true { true } else { false } | |_______________________________________^ expected `bool`, found `&mut bool` @@ -31,10 +31,10 @@ LL + if true { true } else { false } | error[E0308]: mismatched types - --> $DIR/issue-92741.rs:14:5 + --> $DIR/issue-92741.rs:15:5 | -LL | fn baz() -> bool { - | ---- expected `bool` because of return type +LL | fn _baz() -> bool { + | ---- expected `bool` because of return type LL | / & mut LL | | if true { true } else { false } | |___________________________________^ expected `bool`, found `&mut bool` -- 2.44.0