Merging upstream version 1.71.1+dfsg1.

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

6 files changed, 0 insertions, 73 deletions

diff --git a/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_field.rs b/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_field.rs
deleted file mode 100644
index a6a3912ae..000000000
--- a/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_field.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-mod example {
-    use bitflags::bitflags;
-
-    bitflags! {
-        pub struct Flags1: u32 {
-            const FLAG_A = 0b00000001;
-        }
-    }
-}
-
-fn main() {
-    let flag1 = example::Flags1::FLAG_A.bits;
-}
diff --git a/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_field.stderr.beta b/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_field.stderr.beta
deleted file mode 100644
index 58a046601..000000000
--- a/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_field.stderr.beta
+++ /dev/null
@@ -1,10 +0,0 @@
-error[E0616]: field `bits` of struct `Flags1` is private
-  --> $DIR/private_field.rs:12:41
-   |
-12 |     let flag1 = example::Flags1::FLAG_A.bits;
-   |                                         ^^^^ private field
-   |
-help: a method `bits` also exists, call it with parentheses
-   |
-12 |     let flag1 = example::Flags1::FLAG_A.bits();
-   |                                             ^^
diff --git a/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_flags.rs b/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_flags.rs
deleted file mode 100644
index 85a5b1863..000000000
--- a/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_flags.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-mod example {
-    use bitflags::bitflags;
-
-    bitflags! {
-        pub struct Flags1: u32 {
-            const FLAG_A = 0b00000001;
-        }
-
-        struct Flags2: u32 {
-            const FLAG_B = 0b00000010;
-        }
-    }
-}
-
-fn main() {
-    let flag1 = example::Flags1::FLAG_A;
-    let flag2 = example::Flags2::FLAG_B;
-}
diff --git a/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_flags.stderr.beta b/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_flags.stderr.beta
deleted file mode 100644
index d23f83209..000000000
--- a/extra/bitflags-1.3.2/tests/compile-fail/visibility/private_flags.stderr.beta
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0603]: struct `Flags2` is private
-  --> $DIR/private_flags.rs:17:26
-   |
-17 |     let flag2 = example::Flags2::FLAG_B;
-   |                          ^^^^^^ private struct
-   |
-note: the struct `Flags2` is defined here
-  --> $DIR/private_flags.rs:4:5
-   |
-4  | /     bitflags! {
-5  | |         pub struct Flags1: u32 {
-6  | |             const FLAG_A = 0b00000001;
-7  | |         }
-...  |
-11 | |         }
-12 | |     }
-   | |_____^
-   = note: this error originates in the macro `bitflags` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/extra/bitflags-1.3.2/tests/compile-fail/visibility/pub_const.rs b/extra/bitflags-1.3.2/tests/compile-fail/visibility/pub_const.rs
deleted file mode 100644
index b90f0ce92..000000000
--- a/extra/bitflags-1.3.2/tests/compile-fail/visibility/pub_const.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use bitflags::bitflags;
-
-bitflags! {
-    pub struct Flags1: u32 {
-        pub const FLAG_A = 0b00000001;
-    }
-}
-
-fn main() {}
diff --git a/extra/bitflags-1.3.2/tests/compile-fail/visibility/pub_const.stderr.beta b/extra/bitflags-1.3.2/tests/compile-fail/visibility/pub_const.stderr.beta
deleted file mode 100644
index b01122c7a..000000000
--- a/extra/bitflags-1.3.2/tests/compile-fail/visibility/pub_const.stderr.beta
+++ /dev/null
@@ -1,5 +0,0 @@
-error: no rules expected the token `pub`
- --> $DIR/pub_const.rs:5:9
-  |
-5 |         pub const FLAG_A = 0b00000001;
-  |         ^^^ no rules expected this token in macro call