Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 42 deletions

diff --git a/src/test/ui/resolve/resolve-primitive-fallback.stderr b/src/test/ui/resolve/resolve-primitive-fallback.stderr
deleted file mode 100644
index 6d5d5bad9..000000000
--- a/src/test/ui/resolve/resolve-primitive-fallback.stderr
+++ /dev/null
@@ -1,42 +0,0 @@
-error[E0423]: expected value, found builtin type `u16`
-  --> $DIR/resolve-primitive-fallback.rs:3:23
-   |
-LL |     std::mem::size_of(u16);
-   |                       ^^^ not a value
-
-error[E0412]: cannot find type `u8` in the crate root
-  --> $DIR/resolve-primitive-fallback.rs:8:14
-   |
-LL |     let _: ::u8;
-   |              ^^ not found in the crate root
-   |
-help: consider importing this builtin type
-   |
-LL | use std::primitive::u8;
-   |
-help: if you import `u8`, refer to it directly
-   |
-LL -     let _: ::u8;
-LL +     let _: u8;
-   |
-
-error[E0061]: this function takes 0 arguments but 1 argument was supplied
-  --> $DIR/resolve-primitive-fallback.rs:3:5
-   |
-LL |     std::mem::size_of(u16);
-   |     ^^^^^^^^^^^^^^^^^ --- argument unexpected
-   |
-note: function defined here
-  --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |              ^^^^^^^
-help: remove the extra argument
-   |
-LL |     std::mem::size_of();
-   |                      ~~
-
-error: aborting due to 3 previous errors
-
-Some errors have detailed explanations: E0061, E0412, E0423.
-For more information about an error, try `rustc --explain E0061`.