Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 53 deletions

diff --git a/src/test/ui/proc-macro/parent-source-spans.rs b/src/test/ui/proc-macro/parent-source-spans.rs
deleted file mode 100644
index 354657db4..000000000
--- a/src/test/ui/proc-macro/parent-source-spans.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// aux-build:parent-source-spans.rs
-
-#![feature(decl_macro)]
-
-extern crate parent_source_spans;
-
-use parent_source_spans::parent_source_spans;
-
-macro one($a:expr, $b:expr) {
-    two!($a, $b);
-    //~^ ERROR first parent: "hello"
-    //~| ERROR second parent: "world"
-}
-
-macro two($a:expr, $b:expr) {
-    three!($a, $b);
-    //~^ ERROR first final: "hello"
-    //~| ERROR second final: "world"
-    //~| ERROR first final: "yay"
-    //~| ERROR second final: "rust"
-}
-
-// forwarding tokens directly doesn't create a new source chain
-macro three($($tokens:tt)*) {
-    four!($($tokens)*);
-}
-
-macro four($($tokens:tt)*) {
-    parent_source_spans!($($tokens)*);
-    //~^ ERROR cannot find value `ok` in this scope
-    //~| ERROR cannot find value `ok` in this scope
-    //~| ERROR cannot find value `ok` in this scope
-}
-
-fn main() {
-    one!("hello", "world");
-    //~^ ERROR first grandparent: "hello"
-    //~| ERROR second grandparent: "world"
-    //~| ERROR first source: "hello"
-    //~| ERROR second source: "world"
-
-    two!("yay", "rust");
-    //~^ ERROR first parent: "yay"
-    //~| ERROR second parent: "rust"
-    //~| ERROR first source: "yay"
-    //~| ERROR second source: "rust"
-
-    three!("hip", "hop");
-    //~^ ERROR first final: "hip"
-    //~| ERROR second final: "hop"
-    //~| ERROR first source: "hip"
-    //~| ERROR second source: "hop"
-}