Refactored verbose print into a function

[hencrice]

Also handle Tuple and Array separately, which was not explicitly checked.

Fixes #79799.

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eddyb (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

[hencrice]

x.py check and x.py test src/test/ui passed.

[oli-obk]

Awesome! Thanks for doing this.

I think the only tests that should be affected are mir-opt tests, so running ./x.py test src/tests/mir-opt --bless and then ./x.py test src/tests/mir-opt --bless --target i686-unknown-linux-gnu should update anything that needs updating. The second run is so the 32 bit tests are updated, too.

[oli-obk]

r? @oli-obk

[hencrice]

Thanks for the feedbacks. I will take a look!

[hencrice]

@oli-obk I'm not familiar with mir. Could you verify the changes to the diff file are expected? Thanks!

[rust-log-analyzer]

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

configure: rust.channel         := nightly
configure: rust.debug-assertions := True
configure: llvm.assertions      := True
configure: dist.missing-tools   := True
configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
configure: writing `config.toml` in current directory
configure: 
configure: run `python /checkout/x.py --help`
configure: 
---
skip untracked path cpu-usage.csv during rustfmt invocations
skip untracked path src/doc/book/ during rustfmt invocations
skip untracked path src/doc/rust-by-example/ during rustfmt invocations
skip untracked path src/llvm-project/ during rustfmt invocations
Diff in /checkout/compiler/rustc_mir/src/util/pretty.rs at line 413:
         ty::Int(_) | ty::Uint(_) | ty::Bool | ty::Char | ty::Float(_) => false,
Running `"/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/rustfmt" "--config-path" "/checkout" "--edition" "2018" "--unstable-features" "--skip-children" "--check" "/checkout/compiler/rustc_mir/src/util/pretty.rs"` failed.
If you're running `tidy`, try again with `--bless`. Or, if you just want to format code, run `./x.py fmt` instead.
         // Unit type
         ty::Tuple(g_args) if g_args.is_empty() => false,
-        ty::Tuple(g_args) => g_args.iter().any(|g_arg| {
-            use_verbose(&g_arg.expect_ty())
-        }),
+        ty::Tuple(g_args) => g_args.iter().any(|g_arg| use_verbose(&g_arg.expect_ty())),
         ty::Array(ty, _) => use_verbose(ty),
         ty::FnDef(..) => false,
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --stage 2 src/tools/tidy
Build completed unsuccessfully in 0:00:18

[oli-obk]

@oli-obk I'm not familiar with mir. Could you verify the changes to the diff file are expected? Thanks!

The changes look exactly right to me. Ah, and just saw that you fixed the formatting, thanks!

@bors r+

[bors]

📌 Commit ecba49c has been approved by oli-obk

[Mark-Simulacrum]

@bors squash

No need for stray formatting commit :)

[bors]

🔒 Squashing failed