Merging upstream version 1.68.2+dfsg1.

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

32 files changed, 0 insertions, 481 deletions

diff --git a/src/test/ui/codemap_tests/bad-format-args.rs b/src/test/ui/codemap_tests/bad-format-args.rs
deleted file mode 100644
index e89a45a84..000000000
--- a/src/test/ui/codemap_tests/bad-format-args.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn main() {
-    format!(); //~ ERROR requires at least a format string argument
-    format!("" 1); //~ ERROR expected `,`, found `1`
-    format!("", 1 1); //~ ERROR expected one of
-}
diff --git a/src/test/ui/codemap_tests/bad-format-args.stderr b/src/test/ui/codemap_tests/bad-format-args.stderr
deleted file mode 100644
index 8f79beaa9..000000000
--- a/src/test/ui/codemap_tests/bad-format-args.stderr
+++ /dev/null
@@ -1,22 +0,0 @@
-error: requires at least a format string argument
-  --> $DIR/bad-format-args.rs:2:5
-   |
-LL |     format!();
-   |     ^^^^^^^^^
-   |
-   = note: this error originates in the macro `$crate::__export::format_args` which comes from the expansion of the macro `format` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected `,`, found `1`
-  --> $DIR/bad-format-args.rs:3:16
-   |
-LL |     format!("" 1);
-   |                ^ expected `,`
-
-error: expected one of `,`, `.`, `?`, or an operator, found `1`
-  --> $DIR/bad-format-args.rs:4:19
-   |
-LL |     format!("", 1 1);
-   |                   ^ expected one of `,`, `.`, `?`, or an operator
-
-error: aborting due to 3 previous errors
-
diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
deleted file mode 100644
index 414acfd84..000000000
--- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#![allow(dead_code)]
-
-trait C {}
-impl dyn C { fn f() {} } //~ ERROR duplicate
-impl dyn C { fn f() {} }
-fn main() { }
diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
deleted file mode 100644
index 2c1c3c2dc..000000000
--- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0592]: duplicate definitions with name `f`
-  --> $DIR/coherence-overlapping-inherent-impl-trait.rs:4:14
-   |
-LL | impl dyn C { fn f() {} }
-   |              ^^^^^^ duplicate definitions for `f`
-LL | impl dyn C { fn f() {} }
-   |              ------ other definition for `f`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0592`.
diff --git a/src/test/ui/codemap_tests/empty_span.rs b/src/test/ui/codemap_tests/empty_span.rs
deleted file mode 100644
index 7753e2ece..000000000
--- a/src/test/ui/codemap_tests/empty_span.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(negative_impls)]
-fn main() {
-    struct Foo;
-
-    impl !Sync for Foo {}
-
-    unsafe impl Send for &'static Foo { } //~ ERROR cross-crate traits with a default impl
-}
diff --git a/src/test/ui/codemap_tests/empty_span.stderr b/src/test/ui/codemap_tests/empty_span.stderr
deleted file mode 100644
index e36f59ee5..000000000
--- a/src/test/ui/codemap_tests/empty_span.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0321]: cross-crate traits with a default impl, like `Send`, can only be implemented for a struct/enum type, not `&'static Foo`
-  --> $DIR/empty_span.rs:7:5
-   |
-LL |     unsafe impl Send for &'static Foo { }
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't implement cross-crate trait with a default impl for non-struct/enum type
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0321`.
diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.rs b/src/test/ui/codemap_tests/huge_multispan_highlight.rs
deleted file mode 100644
index 623c59081..000000000
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-fn main() {
-    let x = "foo";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    let y = &mut x; //~ ERROR cannot borrow
-}
diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr b/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
deleted file mode 100644
index a60f1c77a..000000000
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
-  --> $DIR/huge_multispan_highlight.rs:90:13
-   |
-LL |     let x = "foo";
-   |         - help: consider changing this to be mutable: `mut x`
-...
-LL |     let y = &mut x;
-   |             ^^^^^^ cannot borrow as mutable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/codemap_tests/issue-11715.rs b/src/test/ui/codemap_tests/issue-11715.rs
deleted file mode 100644
index 617d57ff7..000000000
--- a/src/test/ui/codemap_tests/issue-11715.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#![feature(rustc_attrs)]
-fn main() { #![rustc_error] // rust-lang/rust#49855
-    let mut x = "foo";
-    let y = &mut x;
-    let z = &mut x; //~ ERROR cannot borrow
-    z.use_mut();
-    y.use_mut();
-}
-
-trait Fake { fn use_mut(&mut self) { } fn use_ref(&self) { }  }
-impl<T> Fake for T { }
diff --git a/src/test/ui/codemap_tests/issue-11715.stderr b/src/test/ui/codemap_tests/issue-11715.stderr
deleted file mode 100644
index a6b2b2e50..000000000
--- a/src/test/ui/codemap_tests/issue-11715.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0499]: cannot borrow `x` as mutable more than once at a time
-  --> $DIR/issue-11715.rs:5:13
-   |
-LL |     let y = &mut x;
-   |             ------ first mutable borrow occurs here
-LL |     let z = &mut x;
-   |             ^^^^^^ second mutable borrow occurs here
-LL |     z.use_mut();
-LL |     y.use_mut();
-   |     ----------- first borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/codemap_tests/issue-28308.rs b/src/test/ui/codemap_tests/issue-28308.rs
deleted file mode 100644
index 81493f8c4..000000000
--- a/src/test/ui/codemap_tests/issue-28308.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-fn main() {
-    assert!("foo");
-    //~^ ERROR cannot apply unary operator `!`
-}
diff --git a/src/test/ui/codemap_tests/issue-28308.stderr b/src/test/ui/codemap_tests/issue-28308.stderr
deleted file mode 100644
index 7daa0510c..000000000
--- a/src/test/ui/codemap_tests/issue-28308.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0600]: cannot apply unary operator `!` to type `&'static str`
-  --> $DIR/issue-28308.rs:2:5
-   |
-LL |     assert!("foo");
-   |     ^^^^^^^^^^^^^^ cannot apply unary operator `!`
-   |
-   = note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0600`.
diff --git a/src/test/ui/codemap_tests/one_line.rs b/src/test/ui/codemap_tests/one_line.rs
deleted file mode 100644
index bb36813db..000000000
--- a/src/test/ui/codemap_tests/one_line.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-fn main() {
-    let mut v = vec![Some("foo"), Some("bar")];
-    v.push(v.pop().unwrap()); //~ ERROR cannot borrow
-}
diff --git a/src/test/ui/codemap_tests/one_line.stderr b/src/test/ui/codemap_tests/one_line.stderr
deleted file mode 100644
index 6fe6e2613..000000000
--- a/src/test/ui/codemap_tests/one_line.stderr
+++ /dev/null
@@ -1,24 +0,0 @@
-error[E0499]: cannot borrow `v` as mutable more than once at a time
-  --> $DIR/one_line.rs:3:12
-   |
-LL |     v.push(v.pop().unwrap());
-   |     -------^^^^^^^----------
-   |     | |    |
-   |     | |    second mutable borrow occurs here
-   |     | first borrow later used by call
-   |     first mutable borrow occurs here
-   |
-help: try adding a local storing this argument...
-  --> $DIR/one_line.rs:3:12
-   |
-LL |     v.push(v.pop().unwrap());
-   |            ^^^^^^^
-help: ...and then using that local as the argument to this call
-  --> $DIR/one_line.rs:3:5
-   |
-LL |     v.push(v.pop().unwrap());
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.rs b/src/test/ui/codemap_tests/overlapping_inherent_impls.rs
deleted file mode 100644
index 66af21226..000000000
--- a/src/test/ui/codemap_tests/overlapping_inherent_impls.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Test that you cannot define items with the same name in overlapping inherent
-// impl blocks.
-
-#![allow(unused)]
-
-struct Foo;
-
-impl Foo {
-    fn id() {} //~ ERROR duplicate definitions
-}
-
-impl Foo {
-    fn id() {}
-}
-
-struct Bar<T>(T);
-
-impl<T> Bar<T> {
-    fn bar(&self) {} //~ ERROR duplicate definitions
-}
-
-impl Bar<u32> {
-    fn bar(&self) {}
-}
-
-struct Baz<T>(T);
-
-impl<T: Copy> Baz<T> {
-    fn baz(&self) {} //~ ERROR duplicate definitions
-}
-
-impl<T> Baz<Vec<T>> {
-    fn baz(&self) {}
-}
-
-fn main() {}
diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr b/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
deleted file mode 100644
index 6fca12e18..000000000
--- a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
+++ /dev/null
@@ -1,32 +0,0 @@
-error[E0592]: duplicate definitions with name `id`
-  --> $DIR/overlapping_inherent_impls.rs:9:5
-   |
-LL |     fn id() {}
-   |     ^^^^^^^ duplicate definitions for `id`
-...
-LL |     fn id() {}
-   |     ------- other definition for `id`
-
-error[E0592]: duplicate definitions with name `bar`
-  --> $DIR/overlapping_inherent_impls.rs:19:5
-   |
-LL |     fn bar(&self) {}
-   |     ^^^^^^^^^^^^^ duplicate definitions for `bar`
-...
-LL |     fn bar(&self) {}
-   |     ------------- other definition for `bar`
-
-error[E0592]: duplicate definitions with name `baz`
-  --> $DIR/overlapping_inherent_impls.rs:29:5
-   |
-LL |     fn baz(&self) {}
-   |     ^^^^^^^^^^^^^ duplicate definitions for `baz`
-...
-LL |     fn baz(&self) {}
-   |     ------------- other definition for `baz`
-   |
-   = note: upstream crates may add a new impl of trait `std::marker::Copy` for type `std::vec::Vec<_>` in future versions
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0592`.
diff --git a/src/test/ui/codemap_tests/tab.rs b/src/test/ui/codemap_tests/tab.rs
deleted file mode 100644
index 64569f2e7..000000000
--- a/src/test/ui/codemap_tests/tab.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// ignore-tidy-tab
-
-fn main() {
-	bar; //~ ERROR cannot find value `bar`
-}
-
-fn foo() {
-	"bar			boo" //~ ERROR mismatched types
-}
diff --git a/src/test/ui/codemap_tests/tab.stderr b/src/test/ui/codemap_tests/tab.stderr
deleted file mode 100644
index c3f19d20d..000000000
--- a/src/test/ui/codemap_tests/tab.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0425]: cannot find value `bar` in this scope
-  --> $DIR/tab.rs:4:2
-   |
-LL |     bar;
-   |     ^^^ not found in this scope
-
-error[E0308]: mismatched types
-  --> $DIR/tab.rs:8:2
-   |
-LL | fn foo() {
-   |          - help: try adding a return type: `-> &'static str`
-LL |     "bar            boo"
-   |     ^^^^^^^^^^^^^^^^^^^^ expected `()`, found `&str`
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0308, E0425.
-For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/codemap_tests/tab_2.rs b/src/test/ui/codemap_tests/tab_2.rs
deleted file mode 100644
index 644697c32..000000000
--- a/src/test/ui/codemap_tests/tab_2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// ignore-tidy-tab
-
-fn main() {
-				"""; //~ ERROR unterminated double quote
-}
diff --git a/src/test/ui/codemap_tests/tab_2.stderr b/src/test/ui/codemap_tests/tab_2.stderr
deleted file mode 100644
index 0bfdc3ac2..000000000
--- a/src/test/ui/codemap_tests/tab_2.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0765]: unterminated double quote string
-  --> $DIR/tab_2.rs:4:7
-   |
-LL |                   """;
-   |  ___________________^
-LL | | }
-   | |__^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0765`.
diff --git a/src/test/ui/codemap_tests/tab_3.rs b/src/test/ui/codemap_tests/tab_3.rs
deleted file mode 100644
index 58b034d0f..000000000
--- a/src/test/ui/codemap_tests/tab_3.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// ignore-tidy-tab
-
-fn main() {
-	let some_vec = vec!["hi"];
-	some_vec.into_iter();
-	{
-		println!("{:?}", some_vec); //~ ERROR borrow of moved
-	}
-}
diff --git a/src/test/ui/codemap_tests/tab_3.stderr b/src/test/ui/codemap_tests/tab_3.stderr
deleted file mode 100644
index 080f6c394..000000000
--- a/src/test/ui/codemap_tests/tab_3.stderr
+++ /dev/null
@@ -1,25 +0,0 @@
-error[E0382]: borrow of moved value: `some_vec`
-  --> $DIR/tab_3.rs:7:20
-   |
-LL |     let some_vec = vec!["hi"];
-   |         -------- move occurs because `some_vec` has type `Vec<&str>`, which does not implement the `Copy` trait
-LL |     some_vec.into_iter();
-   |              ----------- `some_vec` moved due to this method call
-LL |     {
-LL |         println!("{:?}", some_vec);
-   |                          ^^^^^^^^ value borrowed here after move
-   |
-note: this function takes ownership of the receiver `self`, which moves `some_vec`
-  --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
-   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: consider cloning the value if the performance cost is acceptable
-   |
-LL |     some_vec.clone().into_iter();
-   |             ++++++++
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/codemap_tests/two_files.rs b/src/test/ui/codemap_tests/two_files.rs
deleted file mode 100644
index 71d97d3c2..000000000
--- a/src/test/ui/codemap_tests/two_files.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-include!("two_files_data.rs");
-
-struct Baz { }
-
-impl Bar for Baz { } //~ ERROR expected trait, found type alias
-
-fn main() { }
diff --git a/src/test/ui/codemap_tests/two_files.stderr b/src/test/ui/codemap_tests/two_files.stderr
deleted file mode 100644
index 2eb3fd567..000000000
--- a/src/test/ui/codemap_tests/two_files.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0404]: expected trait, found type alias `Bar`
-  --> $DIR/two_files.rs:5:6
-   |
-LL | impl Bar for Baz { }
-   |      ^^^ type aliases cannot be used as traits
-   |
-help: you might have meant to use `#![feature(trait_alias)]` instead of a `type` alias
-  --> $DIR/two_files_data.rs:5:1
-   |
-LL | trait Bar = dyn Foo;
-   |
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0404`.
diff --git a/src/test/ui/codemap_tests/two_files_data.rs b/src/test/ui/codemap_tests/two_files_data.rs
deleted file mode 100644
index b4d2f5d3c..000000000
--- a/src/test/ui/codemap_tests/two_files_data.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// ignore-test
-
-trait Foo { }
-
-type Bar = dyn Foo;
diff --git a/src/test/ui/codemap_tests/unicode.expanded.stdout b/src/test/ui/codemap_tests/unicode.expanded.stdout
deleted file mode 100644
index d14bb42b2..000000000
--- a/src/test/ui/codemap_tests/unicode.expanded.stdout
+++ /dev/null
@@ -1,13 +0,0 @@
-#![feature(prelude_import)]
-#![no_std]
-#[prelude_import]
-use ::std::prelude::rust_2015::*;
-#[macro_use]
-extern crate std;
-// revisions: normal expanded
-//[expanded] check-pass
-//[expanded]compile-flags: -Zunpretty=expanded
-
-extern "路濫狼á́́" fn foo() {}
-
-fn main() {}
diff --git a/src/test/ui/codemap_tests/unicode.normal.stderr b/src/test/ui/codemap_tests/unicode.normal.stderr
deleted file mode 100644
index 05ceb6910..000000000
--- a/src/test/ui/codemap_tests/unicode.normal.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0703]: invalid ABI: found `路濫狼á́́`
-  --> $DIR/unicode.rs:5:8
-   |
-LL | extern "路濫狼á́́" fn foo() {}
-   |        ^^^^^^^^^ invalid ABI
-   |
-   = note: invoke `rustc --print=calling-conventions` for a full list of supported calling conventions.
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0703`.
diff --git a/src/test/ui/codemap_tests/unicode.rs b/src/test/ui/codemap_tests/unicode.rs
deleted file mode 100644
index 4df9a5270..000000000
--- a/src/test/ui/codemap_tests/unicode.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// revisions: normal expanded
-//[expanded] check-pass
-//[expanded]compile-flags: -Zunpretty=expanded
-
-extern "路濫狼á́́" fn foo() {} //[normal]~ ERROR invalid ABI
-
-fn main() { }
diff --git a/src/test/ui/codemap_tests/unicode_2.rs b/src/test/ui/codemap_tests/unicode_2.rs
deleted file mode 100644
index 3301e7a18..000000000
--- a/src/test/ui/codemap_tests/unicode_2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn main() {
-    let _ = ("a̐éö̲", 0u7); //~ ERROR invalid width
-    let _ = ("아あ", 1i42); //~ ERROR invalid width
-    let _ = a̐é; //~ ERROR cannot find
-}
diff --git a/src/test/ui/codemap_tests/unicode_2.stderr b/src/test/ui/codemap_tests/unicode_2.stderr
deleted file mode 100644
index 19aae1d3c..000000000
--- a/src/test/ui/codemap_tests/unicode_2.stderr
+++ /dev/null
@@ -1,25 +0,0 @@
-error[E0425]: cannot find value `a̐é` in this scope
-  --> $DIR/unicode_2.rs:4:13
-   |
-LL |     let _ = a̐é;
-   |             ^^ not found in this scope
-
-error: invalid width `7` for integer literal
-  --> $DIR/unicode_2.rs:2:25
-   |
-LL |     let _ = ("a̐éö̲", 0u7);
-   |                     ^^^
-   |
-   = help: valid widths are 8, 16, 32, 64 and 128
-
-error: invalid width `42` for integer literal
-  --> $DIR/unicode_2.rs:3:20
-   |
-LL |     let _ = ("아あ", 1i42);
-   |                      ^^^^
-   |
-   = help: valid widths are 8, 16, 32, 64 and 128
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/codemap_tests/unicode_3.rs b/src/test/ui/codemap_tests/unicode_3.rs
deleted file mode 100644
index 34582de45..000000000
--- a/src/test/ui/codemap_tests/unicode_3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// check-pass
-
-fn main() {
-    let s = "ZͨA͑ͦ͒͋ͤ͑̚L̄͑͋Ĝͨͥ̿͒̽̈́Oͥ͛ͭ!̏"; while true { break; } //~ WARNING while_true
-    println!("{}", s);
-}
diff --git a/src/test/ui/codemap_tests/unicode_3.stderr b/src/test/ui/codemap_tests/unicode_3.stderr
deleted file mode 100644
index a35ed99d8..000000000
--- a/src/test/ui/codemap_tests/unicode_3.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-warning: denote infinite loops with `loop { ... }`
-  --> $DIR/unicode_3.rs:4:45
-   |
-LL |     let s = "ZͨA͑ͦ͒͋ͤ͑̚L̄͑͋Ĝͨͥ̿͒̽̈́Oͥ͛ͭ!̏"; while true { break; }
-   |                       ^^^^^^^^^^ help: use `loop`
-   |
-   = note: `#[warn(while_true)]` on by default
-
-warning: 1 warning emitted
-