Auto merge of #42482 - eddyb:issue-42467, r=nikomatsakis

rustc: T: 'empty always holds for all types.

Fixes #42467 by special-casing `ReEmpty` to always hold, even for parameters.
The reason this is the case is that `ReEmpty` is the result of inferring a region variable with no constraints attached to it, so there is no lifetime a type would contain which would be strictly shorter.

r? @nikomatsakis
This commit is contained in:
bors 2017-06-07 10:09:11 +00:00
commit 37b1f6c4f1
2 changed files with 39 additions and 0 deletions

View File

@ -1201,6 +1201,13 @@ impl<'a, 'gcx, 'tcx> RegionVarBindings<'a, 'gcx, 'tcx> {
for verify in self.verifys.borrow().iter() {
debug!("collect_errors: verify={:?}", verify);
let sub = normalize(self.tcx, var_data, verify.region);
// This was an inference variable which didn't get
// constrained, therefore it can be assume to hold.
if let ty::ReEmpty = *sub {
continue;
}
if verify.bound.is_met(region_rels, var_data, sub) {
continue;
}

View File

@ -0,0 +1,32 @@
// Copyright 2017 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.
struct Foo<T>(T);
struct IntoIter<T>(T);
impl<'a, T: 'a> Iterator for IntoIter<T> {
type Item = ();
fn next(&mut self) -> Option<()> {
None
}
}
impl<T> IntoIterator for Foo<T> {
type Item = ();
type IntoIter = IntoIter<T>;
fn into_iter(self) -> IntoIter<T> {
IntoIter(self.0)
}
}
fn main() {}