Correctly identify named early bound regions.

This commit is contained in:
David Wood 2018-08-06 21:15:15 +02:00
parent 76b69a604e
commit 82b48277a2
No known key found for this signature in database
GPG Key ID: 01760B4F9F53F154
5 changed files with 56 additions and 4 deletions

View File

@ -129,7 +129,7 @@ impl<'a, 'gcx, 'tcx> NiceRegionError<'a, 'gcx, 'tcx> {
ty::BrNamed(..) => true,
_ => false,
},
ty::ReEarlyBound(_) => true,
ty::ReEarlyBound(ebr) => ebr.has_name(),
_ => false,
}
}

View File

@ -51,7 +51,7 @@ use std::{mem, ptr};
use syntax::ast::{self, DUMMY_NODE_ID, Name, Ident, NodeId};
use syntax::attr;
use syntax::ext::hygiene::Mark;
use syntax::symbol::{Symbol, LocalInternedString, InternedString};
use syntax::symbol::{keywords, Symbol, LocalInternedString, InternedString};
use syntax_pos::{DUMMY_SP, Span};
use rustc_data_structures::accumulate_vec::IntoIter as AccIntoIter;
@ -824,6 +824,12 @@ impl ty::EarlyBoundRegion {
pub fn to_bound_region(&self) -> ty::BoundRegion {
ty::BoundRegion::BrNamed(self.def_id, self.name)
}
/// Does this early bound region have a name? Early bound regions normally
/// always have names except when using anonymous lifetimes (`'_`).
pub fn has_name(&self) -> bool {
self.name != keywords::UnderscoreLifetime.name().as_interned_str()
}
}
#[derive(Clone, Debug, RustcEncodable, RustcDecodable)]

View File

@ -95,8 +95,12 @@ impl<'tcx> RegionInferenceContext<'tcx> {
debug!("give_region_a_name: error_region = {:?}", error_region);
match error_region {
ty::ReEarlyBound(ebr) => {
self.highlight_named_span(tcx, error_region, &ebr.name, diag);
Some(ebr.name)
if ebr.has_name() {
self.highlight_named_span(tcx, error_region, &ebr.name, diag);
Some(ebr.name)
} else {
None
}
},
ty::ReStatic => Some(keywords::StaticLifetime.name().as_interned_str()),

View File

@ -0,0 +1,30 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(nll)]
#![feature(in_band_lifetimes)]
struct Foo<'a, 'b> {
x: &'a u32,
y: &'b u32,
}
struct Bar<'b> {
z: &'b u32
}
impl Foo<'_, '_> {
fn take_bar(&mut self, b: Bar<'_>) {
self.y = b.z
//~^ ERROR unsatisfied lifetime constraints
}
}
fn main() { }

View File

@ -0,0 +1,12 @@
error: unsatisfied lifetime constraints
--> $DIR/issue-52742.rs:25:9
|
LL | fn take_bar(&mut self, b: Bar<'_>) {
| --------- -- let's call this `'1`
| |
| lifetime `'2` appears in this type
LL | self.y = b.z
| ^^^^^^^^^^^^ requires that `'1` must outlive `'2`
error: aborting due to previous error