Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 30 deletions

diff --git a/src/test/ui/regions/regions-free-region-ordering-callee.rs b/src/test/ui/regions/regions-free-region-ordering-callee.rs
deleted file mode 100644
index 8158e81e1..000000000
--- a/src/test/ui/regions/regions-free-region-ordering-callee.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Tests that callees correctly infer an ordering between free regions
-// that appear in their parameter list.  See also
-// regions-free-region-ordering-caller.rs
-
-fn ordering1<'a, 'b>(x: &'a &'b usize) -> &'a usize {
-    // It is safe to assume that 'a <= 'b due to the type of x
-    let y: &'b usize = &**x;
-    return y;
-}
-
-fn ordering2<'a, 'b>(x: &'a &'b usize, y: &'a usize) -> &'b usize {
-    // However, it is not safe to assume that 'b <= 'a
-    &*y
-    //~^ ERROR lifetime may not live long enough
-}
-
-fn ordering3<'a, 'b>(x: &'a usize, y: &'b usize) -> &'a &'b usize {
-    // Do not infer an ordering from the return value.
-    let z: &'b usize = &*x;
-    //~^ ERROR lifetime may not live long enough
-    panic!();
-}
-
-// see regions-free-region-ordering-callee-4.rs
-
-fn ordering5<'a, 'b>(a: &'a usize, b: &'b usize, x: Option<&'a &'b usize>) {
-    let z: Option<&'a &'b usize> = None;
-}
-
-fn main() {}