Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 57 deletions

diff --git a/src/test/ui/inference/inference_unstable.stderr b/src/test/ui/inference/inference_unstable.stderr
deleted file mode 100644
index ecbf2641b..000000000
--- a/src/test/ui/inference/inference_unstable.stderr
+++ /dev/null
@@ -1,57 +0,0 @@
-warning: an associated function with this name may be added to the standard library in the future
-  --> $DIR/inference_unstable.rs:16:20
-   |
-LL |     assert_eq!('x'.ipu_flatten(), 1);
-   |                    ^^^^^^^^^^^
-   |
-   = warning: once this associated item is added to the standard library, the ambiguity may cause an error or change in behavior!
-   = note: for more information, see issue #48919 <https://github.com/rust-lang/rust/issues/48919>
-   = help: call with fully qualified syntax `inference_unstable_itertools::IpuItertools::ipu_flatten(...)` to keep using the current method
-   = help: add `#![feature(ipu_flatten)]` to the crate attributes to enable `inference_unstable_iterator::IpuIterator::ipu_flatten`
-   = note: `#[warn(unstable_name_collisions)]` on by default
-
-warning: an associated function with this name may be added to the standard library in the future
-  --> $DIR/inference_unstable.rs:19:20
-   |
-LL |     assert_eq!('x'.ipu_by_value_vs_by_ref(), 1);
-   |                    ^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = warning: once this associated item is added to the standard library, the ambiguity may cause an error or change in behavior!
-   = note: for more information, see issue #48919 <https://github.com/rust-lang/rust/issues/48919>
-   = help: call with fully qualified syntax `inference_unstable_itertools::IpuItertools::ipu_by_value_vs_by_ref(...)` to keep using the current method
-   = help: add `#![feature(ipu_flatten)]` to the crate attributes to enable `inference_unstable_iterator::IpuIterator::ipu_by_value_vs_by_ref`
-
-warning: an associated function with this name may be added to the standard library in the future
-  --> $DIR/inference_unstable.rs:22:20
-   |
-LL |     assert_eq!('x'.ipu_by_ref_vs_by_ref_mut(), 1);
-   |                    ^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = warning: once this associated item is added to the standard library, the ambiguity may cause an error or change in behavior!
-   = note: for more information, see issue #48919 <https://github.com/rust-lang/rust/issues/48919>
-   = help: call with fully qualified syntax `inference_unstable_itertools::IpuItertools::ipu_by_ref_vs_by_ref_mut(...)` to keep using the current method
-   = help: add `#![feature(ipu_flatten)]` to the crate attributes to enable `inference_unstable_iterator::IpuIterator::ipu_by_ref_vs_by_ref_mut`
-
-warning: an associated function with this name may be added to the standard library in the future
-  --> $DIR/inference_unstable.rs:25:40
-   |
-LL |     assert_eq!((&mut 'x' as *mut char).ipu_by_mut_ptr_vs_by_const_ptr(), 1);
-   |                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = warning: once this associated item is added to the standard library, the ambiguity may cause an error or change in behavior!
-   = note: for more information, see issue #48919 <https://github.com/rust-lang/rust/issues/48919>
-   = help: call with fully qualified syntax `inference_unstable_itertools::IpuItertools::ipu_by_mut_ptr_vs_by_const_ptr(...)` to keep using the current method
-   = help: add `#![feature(ipu_flatten)]` to the crate attributes to enable `inference_unstable_iterator::IpuIterator::ipu_by_mut_ptr_vs_by_const_ptr`
-
-warning: an associated constant with this name may be added to the standard library in the future
-  --> $DIR/inference_unstable.rs:28:16
-   |
-LL |     assert_eq!(char::C, 1);
-   |                ^^^^^^^ help: use the fully qualified path to the associated const: `<char as IpuItertools>::C`
-   |
-   = warning: once this associated item is added to the standard library, the ambiguity may cause an error or change in behavior!
-   = note: for more information, see issue #48919 <https://github.com/rust-lang/rust/issues/48919>
-   = help: add `#![feature(assoc_const_ipu_iter)]` to the crate attributes to enable `inference_unstable_iterator::IpuIterator::C`
-
-warning: 5 warnings emitted
-