New upstream version 1.63.0+dfsg1

[rustc.git] / src / test / ui / variance / variance-btree-invariant-types.rs

diff --git a/src/test/ui/variance/variance-btree-invariant-types.rs b/src/test/ui/variance/variance-btree-invariant-types.rs
index 7ddf6b294a5a19221c1c6f8d04f4b717ec677316..09c93d0013cce65d8a48fc7fd2191ab7a67ec344 100644 (file)
--- a/src/test/ui/variance/variance-btree-invariant-types.rs
+++ b/src/test/ui/variance/variance-btree-invariant-types.rs
@@ -1,99 +1,79 @@
 use std::collections::btree_map::{IterMut, OccupiedEntry, RangeMut, VacantEntry};
 
-// revisions: base nll
-// ignore-compare-mode-nll
-//[nll] compile-flags: -Z borrowck=mir
-
 fn iter_cov_key<'a, 'new>(v: IterMut<'a, &'static (), ()>) -> IterMut<'a, &'new (), ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn iter_cov_val<'a, 'new>(v: IterMut<'a, (), &'static ()>) -> IterMut<'a, (), &'new ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn iter_contra_key<'a, 'new>(v: IterMut<'a, &'new (), ()>) -> IterMut<'a, &'static (), ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn iter_contra_val<'a, 'new>(v: IterMut<'a, (), &'new ()>) -> IterMut<'a, (), &'static ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 
 fn range_cov_key<'a, 'new>(v: RangeMut<'a, &'static (), ()>) -> RangeMut<'a, &'new (), ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn range_cov_val<'a, 'new>(v: RangeMut<'a, (), &'static ()>) -> RangeMut<'a, (), &'new ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn range_contra_key<'a, 'new>(v: RangeMut<'a, &'new (), ()>) -> RangeMut<'a, &'static (), ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn range_contra_val<'a, 'new>(v: RangeMut<'a, (), &'new ()>) -> RangeMut<'a, (), &'static ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 
 fn occ_cov_key<'a, 'new>(v: OccupiedEntry<'a, &'static (), ()>)
                          -> OccupiedEntry<'a, &'new (), ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn occ_cov_val<'a, 'new>(v: OccupiedEntry<'a, (), &'static ()>)
                          -> OccupiedEntry<'a, (), &'new ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn occ_contra_key<'a, 'new>(v: OccupiedEntry<'a, &'new (), ()>)
                             -> OccupiedEntry<'a, &'static (), ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn occ_contra_val<'a, 'new>(v: OccupiedEntry<'a, (), &'new ()>)
                             -> OccupiedEntry<'a, (), &'static ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 
 fn vac_cov_key<'a, 'new>(v: VacantEntry<'a, &'static (), ()>)
                          -> VacantEntry<'a, &'new (), ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn vac_cov_val<'a, 'new>(v: VacantEntry<'a, (), &'static ()>)
                          -> VacantEntry<'a, (), &'new ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn vac_contra_key<'a, 'new>(v: VacantEntry<'a, &'new (), ()>)
                             -> VacantEntry<'a, &'static (), ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }
 fn vac_contra_val<'a, 'new>(v: VacantEntry<'a, (), &'new ()>)
                             -> VacantEntry<'a, (), &'static ()> {
     v
-    //[base]~^ ERROR mismatched types
-    //[nll]~^^ lifetime may not live long enough
+    //~^ lifetime may not live long enough
 }