Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 32 deletions

diff --git a/src/test/ui/macros/builtin-std-paths.rs b/src/test/ui/macros/builtin-std-paths.rs
deleted file mode 100644
index 2083f9ba3..000000000
--- a/src/test/ui/macros/builtin-std-paths.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// check-pass
-
-#[derive(
-    core::clone::Clone,
-    core::marker::Copy,
-    core::fmt::Debug,
-    core::default::Default,
-    core::cmp::Eq,
-    core::hash::Hash,
-    core::cmp::Ord,
-    core::cmp::PartialEq,
-    core::cmp::PartialOrd,
-)]
-struct Core;
-
-#[derive(
-    std::clone::Clone,
-    std::marker::Copy,
-    std::fmt::Debug,
-    std::default::Default,
-    std::cmp::Eq,
-    std::hash::Hash,
-    std::cmp::Ord,
-    std::cmp::PartialEq,
-    std::cmp::PartialOrd,
-)]
-struct Std;
-
-fn main() {
-    core::column!();
-    std::column!();
-}