Skip to content
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

Don't delay ReError bug during lexical region resolve #108176

Merged
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ impl<'tcx> LexicalRegionResolutions<'tcx> {
ty::ReVar(rid) => match self.values[rid] {
VarValue::Empty(_) => r,
VarValue::Value(r) => r,
VarValue::ErrorValue => tcx.mk_re_error_misc(),
VarValue::ErrorValue => tcx.lifetimes.re_static,
},
_ => r,
};
Expand Down
22 changes: 22 additions & 0 deletions tests/ui/regions/resolve-re-error-ice.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// check-pass

// Allow this for now, can remove this UI test when this becomes a hard error.
#![allow(implied_bounds_entailment)]

use std::collections::hash_map::{Keys, HashMap};
use std::marker::PhantomData;

trait MapAssertion<'a, K, V, R> {
fn key_set(&self) -> Subject<Keys<K, V>, (), R>;
}

struct Subject<'a, T, V, R>(PhantomData<(&'a T, V, R)>);

impl<'a, K, V, R> MapAssertion<'a, K, V, R> for Subject<'a, HashMap<K, V>, (), R>
{
fn key_set(&self) -> Subject<'a, Keys<K, V>, (), R> {
todo!()
}
}

fn main() {}
15 changes: 15 additions & 0 deletions tests/ui/regions/resolve-re-error-ice.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Future incompatibility report: Future breakage diagnostic:
warning: impl method assumes more implied bounds than the corresponding trait method
--> $DIR/resolve-re-error-ice.rs:17:16
|
LL | fn key_set(&self) -> Subject<'a, Keys<K, V>, (), R> {
| ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace this type to make the impl signature compatible: `Subject<'_, std::collections::hash_map::Keys<'_, K, V>, (), R>`
|
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= note: for more information, see issue #105572 <https://github.com/rust-lang/rust/issues/105572>
note: the lint level is defined here
--> $DIR/resolve-re-error-ice.rs:4:10
|
LL | #![allow(implied_bounds_entailment)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^