Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 30 deletions

diff --git a/src/test/ui/macros/issue-26322.rs b/src/test/ui/macros/issue-26322.rs
deleted file mode 100644
index c1dc80eb7..000000000
--- a/src/test/ui/macros/issue-26322.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// run-pass
-#![allow(non_camel_case_types)]
-#![allow(non_snake_case)]
-
-macro_rules! columnline {
-    () => (
-        (column!(), line!())
-    )
-}
-
-macro_rules! indirectcolumnline {
-    () => (
-        (||{ columnline!() })()
-    )
-}
-
-fn main() {
-    let closure = || {
-        columnline!()
-    };
-    let iflet = if let Some(_) = Some(0) {
-        columnline!()
-    } else { (0, 0) };
-    let cl = columnline!();
-    assert_eq!(closure(), (9, 19));
-    assert_eq!(iflet, (9, 22));
-    assert_eq!(cl, (14, 24));
-    let indirect = indirectcolumnline!();
-    assert_eq!(indirect, (20, 28));
-}