Auto merge of #145997 - matthiaskrgr:rollup-tsgylre, r=matthiaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang/rust#145675 (Rehome 30 `tests/ui/issues/` tests to other subdirectories under `tests/ui/` [rust-lang/rust#1 of Batch rust-lang/rust#2])
 - rust-lang/rust#145676 (Rehome 30 `tests/ui/issues/` tests to other subdirectories under `tests/ui/` [rust-lang/rust#2 of Batch rust-lang/rust#2])
 - rust-lang/rust#145982 (compiletest: Reduce the number of `println!` calls that don't have access to `TestCx`)
 - rust-lang/rust#145984 (`TokenStream` cleanups)

r? `@ghost`
`@rustbot` modify labels: rollup

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/ui/function-pointer/function-pointer-comparison-54696.rs b/tests/ui/function-pointer/function-pointer-comparison-54696.rs
new file mode 100644
index 00000000000..2e28dfeaaf8
--- /dev/null
+++ b/tests/ui/function-pointer/function-pointer-comparison-54696.rs
@@ -0,0 +1,11 @@
+// https://github.com/rust-lang/rust/issues/54696
+//@ run-pass
+
+#![allow(unpredictable_function_pointer_comparisons)]
+
+fn main() {
+    // We shouldn't promote this
+    let _ = &(main as fn() == main as fn());
+    // Also check nested case
+    let _ = &(&(main as fn()) == &(main as fn()));
+}