Skip to content

BTree: test range_mut's variance the same way as iter_mut's is tested #86228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 49 additions & 9 deletions src/test/ui/variance/variance-btree-invariant-types.nll.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,47 @@ LL | v
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:18:5
--> $DIR/variance-btree-invariant-types.rs:17:5
|
LL | fn range_cov_key<'a, 'new>(v: RangeMut<'a, &'static (), ()>) -> RangeMut<'a, &'new (), ()> {
| ---- lifetime `'new` defined here
LL | v
| ^ returning this value requires that `'new` must outlive `'static`
|
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:20:5
|
LL | fn range_cov_val<'a, 'new>(v: RangeMut<'a, (), &'static ()>) -> RangeMut<'a, (), &'new ()> {
| ---- lifetime `'new` defined here
LL | v
| ^ returning this value requires that `'new` must outlive `'static`
|
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:23:5
|
LL | fn range_contra_key<'a, 'new>(v: RangeMut<'a, &'new (), ()>) -> RangeMut<'a, &'static (), ()> {
| ---- lifetime `'new` defined here
LL | v
| ^ returning this value requires that `'new` must outlive `'static`
|
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:26:5
|
LL | fn range_contra_val<'a, 'new>(v: RangeMut<'a, (), &'new ()>) -> RangeMut<'a, (), &'static ()> {
| ---- lifetime `'new` defined here
LL | v
| ^ returning this value requires that `'new` must outlive `'static`
|
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:31:5
|
LL | fn occ_cov_key<'a, 'new>(v: OccupiedEntry<'a, &'static (), ()>)
| ---- lifetime `'new` defined here
Expand All @@ -50,7 +90,7 @@ LL | v
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:22:5
--> $DIR/variance-btree-invariant-types.rs:35:5
|
LL | fn occ_cov_val<'a, 'new>(v: OccupiedEntry<'a, (), &'static ()>)
| ---- lifetime `'new` defined here
Expand All @@ -61,7 +101,7 @@ LL | v
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:26:5
--> $DIR/variance-btree-invariant-types.rs:39:5
|
LL | fn occ_contra_key<'a, 'new>(v: OccupiedEntry<'a, &'new (), ()>)
| ---- lifetime `'new` defined here
Expand All @@ -72,7 +112,7 @@ LL | v
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:30:5
--> $DIR/variance-btree-invariant-types.rs:43:5
|
LL | fn occ_contra_val<'a, 'new>(v: OccupiedEntry<'a, (), &'new ()>)
| ---- lifetime `'new` defined here
Expand All @@ -83,7 +123,7 @@ LL | v
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:35:5
--> $DIR/variance-btree-invariant-types.rs:48:5
|
LL | fn vac_cov_key<'a, 'new>(v: VacantEntry<'a, &'static (), ()>)
| ---- lifetime `'new` defined here
Expand All @@ -94,7 +134,7 @@ LL | v
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:39:5
--> $DIR/variance-btree-invariant-types.rs:52:5
|
LL | fn vac_cov_val<'a, 'new>(v: VacantEntry<'a, (), &'static ()>)
| ---- lifetime `'new` defined here
Expand All @@ -105,7 +145,7 @@ LL | v
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:43:5
--> $DIR/variance-btree-invariant-types.rs:56:5
|
LL | fn vac_contra_key<'a, 'new>(v: VacantEntry<'a, &'new (), ()>)
| ---- lifetime `'new` defined here
Expand All @@ -116,7 +156,7 @@ LL | v
= help: consider replacing `'new` with `'static`

error: lifetime may not live long enough
--> $DIR/variance-btree-invariant-types.rs:47:5
--> $DIR/variance-btree-invariant-types.rs:60:5
|
LL | fn vac_contra_val<'a, 'new>(v: VacantEntry<'a, (), &'new ()>)
| ---- lifetime `'new` defined here
Expand All @@ -126,5 +166,5 @@ LL | v
|
= help: consider replacing `'new` with `'static`

error: aborting due to 12 previous errors
error: aborting due to 16 previous errors

15 changes: 14 additions & 1 deletion src/test/ui/variance/variance-btree-invariant-types.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::collections::btree_map::{IterMut, OccupiedEntry, VacantEntry};
use std::collections::btree_map::{IterMut, OccupiedEntry, RangeMut, VacantEntry};

fn iter_cov_key<'a, 'new>(v: IterMut<'a, &'static (), ()>) -> IterMut<'a, &'new (), ()> {
v //~ ERROR mismatched types
Expand All @@ -13,6 +13,19 @@ fn iter_contra_val<'a, 'new>(v: IterMut<'a, (), &'new ()>) -> IterMut<'a, (), &'
v //~ ERROR mismatched types
}

fn range_cov_key<'a, 'new>(v: RangeMut<'a, &'static (), ()>) -> RangeMut<'a, &'new (), ()> {
v //~ ERROR mismatched types
}
fn range_cov_val<'a, 'new>(v: RangeMut<'a, (), &'static ()>) -> RangeMut<'a, (), &'new ()> {
v //~ ERROR mismatched types
}
fn range_contra_key<'a, 'new>(v: RangeMut<'a, &'new (), ()>) -> RangeMut<'a, &'static (), ()> {
v //~ ERROR mismatched types
}
fn range_contra_val<'a, 'new>(v: RangeMut<'a, (), &'new ()>) -> RangeMut<'a, (), &'static ()> {
v //~ ERROR mismatched types
}

fn occ_cov_key<'a, 'new>(v: OccupiedEntry<'a, &'static (), ()>)
-> OccupiedEntry<'a, &'new (), ()> {
v //~ ERROR mismatched types
Expand Down
110 changes: 85 additions & 25 deletions src/test/ui/variance/variance-btree-invariant-types.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -59,125 +59,185 @@ LL | fn iter_contra_val<'a, 'new>(v: IterMut<'a, (), &'new ()>) -> IterMut<'a, (
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:18:5
--> $DIR/variance-btree-invariant-types.rs:17:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `RangeMut<'_, &'new (), _>`
found struct `RangeMut<'_, &'static (), _>`
note: the lifetime `'new` as defined on the function body at 16:22...
--> $DIR/variance-btree-invariant-types.rs:16:22
|
LL | fn range_cov_key<'a, 'new>(v: RangeMut<'a, &'static (), ()>) -> RangeMut<'a, &'new (), ()> {
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:20:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `RangeMut<'_, _, &'new ()>`
found struct `RangeMut<'_, _, &'static ()>`
note: the lifetime `'new` as defined on the function body at 19:22...
--> $DIR/variance-btree-invariant-types.rs:19:22
|
LL | fn range_cov_val<'a, 'new>(v: RangeMut<'a, (), &'static ()>) -> RangeMut<'a, (), &'new ()> {
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:23:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `RangeMut<'_, &'static (), _>`
found struct `RangeMut<'_, &'new (), _>`
note: the lifetime `'new` as defined on the function body at 22:25...
--> $DIR/variance-btree-invariant-types.rs:22:25
|
LL | fn range_contra_key<'a, 'new>(v: RangeMut<'a, &'new (), ()>) -> RangeMut<'a, &'static (), ()> {
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:26:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `RangeMut<'_, _, &'static ()>`
found struct `RangeMut<'_, _, &'new ()>`
note: the lifetime `'new` as defined on the function body at 25:25...
--> $DIR/variance-btree-invariant-types.rs:25:25
|
LL | fn range_contra_val<'a, 'new>(v: RangeMut<'a, (), &'new ()>) -> RangeMut<'a, (), &'static ()> {
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:31:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `std::collections::btree_map::OccupiedEntry<'_, &'new (), _>`
found struct `std::collections::btree_map::OccupiedEntry<'_, &'static (), _>`
note: the lifetime `'new` as defined on the function body at 16:20...
--> $DIR/variance-btree-invariant-types.rs:16:20
note: the lifetime `'new` as defined on the function body at 29:20...
--> $DIR/variance-btree-invariant-types.rs:29:20
|
LL | fn occ_cov_key<'a, 'new>(v: OccupiedEntry<'a, &'static (), ()>)
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:22:5
--> $DIR/variance-btree-invariant-types.rs:35:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `std::collections::btree_map::OccupiedEntry<'_, _, &'new ()>`
found struct `std::collections::btree_map::OccupiedEntry<'_, _, &'static ()>`
note: the lifetime `'new` as defined on the function body at 20:20...
--> $DIR/variance-btree-invariant-types.rs:20:20
note: the lifetime `'new` as defined on the function body at 33:20...
--> $DIR/variance-btree-invariant-types.rs:33:20
|
LL | fn occ_cov_val<'a, 'new>(v: OccupiedEntry<'a, (), &'static ()>)
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:26:5
--> $DIR/variance-btree-invariant-types.rs:39:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `std::collections::btree_map::OccupiedEntry<'_, &'static (), _>`
found struct `std::collections::btree_map::OccupiedEntry<'_, &'new (), _>`
note: the lifetime `'new` as defined on the function body at 24:23...
--> $DIR/variance-btree-invariant-types.rs:24:23
note: the lifetime `'new` as defined on the function body at 37:23...
--> $DIR/variance-btree-invariant-types.rs:37:23
|
LL | fn occ_contra_key<'a, 'new>(v: OccupiedEntry<'a, &'new (), ()>)
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:30:5
--> $DIR/variance-btree-invariant-types.rs:43:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `std::collections::btree_map::OccupiedEntry<'_, _, &'static ()>`
found struct `std::collections::btree_map::OccupiedEntry<'_, _, &'new ()>`
note: the lifetime `'new` as defined on the function body at 28:23...
--> $DIR/variance-btree-invariant-types.rs:28:23
note: the lifetime `'new` as defined on the function body at 41:23...
--> $DIR/variance-btree-invariant-types.rs:41:23
|
LL | fn occ_contra_val<'a, 'new>(v: OccupiedEntry<'a, (), &'new ()>)
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:35:5
--> $DIR/variance-btree-invariant-types.rs:48:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `std::collections::btree_map::VacantEntry<'_, &'new (), _>`
found struct `std::collections::btree_map::VacantEntry<'_, &'static (), _>`
note: the lifetime `'new` as defined on the function body at 33:20...
--> $DIR/variance-btree-invariant-types.rs:33:20
note: the lifetime `'new` as defined on the function body at 46:20...
--> $DIR/variance-btree-invariant-types.rs:46:20
|
LL | fn vac_cov_key<'a, 'new>(v: VacantEntry<'a, &'static (), ()>)
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:39:5
--> $DIR/variance-btree-invariant-types.rs:52:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `std::collections::btree_map::VacantEntry<'_, _, &'new ()>`
found struct `std::collections::btree_map::VacantEntry<'_, _, &'static ()>`
note: the lifetime `'new` as defined on the function body at 37:20...
--> $DIR/variance-btree-invariant-types.rs:37:20
note: the lifetime `'new` as defined on the function body at 50:20...
--> $DIR/variance-btree-invariant-types.rs:50:20
|
LL | fn vac_cov_val<'a, 'new>(v: VacantEntry<'a, (), &'static ()>)
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:43:5
--> $DIR/variance-btree-invariant-types.rs:56:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `std::collections::btree_map::VacantEntry<'_, &'static (), _>`
found struct `std::collections::btree_map::VacantEntry<'_, &'new (), _>`
note: the lifetime `'new` as defined on the function body at 41:23...
--> $DIR/variance-btree-invariant-types.rs:41:23
note: the lifetime `'new` as defined on the function body at 54:23...
--> $DIR/variance-btree-invariant-types.rs:54:23
|
LL | fn vac_contra_key<'a, 'new>(v: VacantEntry<'a, &'new (), ()>)
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error[E0308]: mismatched types
--> $DIR/variance-btree-invariant-types.rs:47:5
--> $DIR/variance-btree-invariant-types.rs:60:5
|
LL | v
| ^ lifetime mismatch
|
= note: expected struct `std::collections::btree_map::VacantEntry<'_, _, &'static ()>`
found struct `std::collections::btree_map::VacantEntry<'_, _, &'new ()>`
note: the lifetime `'new` as defined on the function body at 45:23...
--> $DIR/variance-btree-invariant-types.rs:45:23
note: the lifetime `'new` as defined on the function body at 58:23...
--> $DIR/variance-btree-invariant-types.rs:58:23
|
LL | fn vac_contra_val<'a, 'new>(v: VacantEntry<'a, (), &'new ()>)
| ^^^^
= note: ...does not necessarily outlive the static lifetime

error: aborting due to 12 previous errors
error: aborting due to 16 previous errors

For more information about this error, try `rustc --explain E0308`.