Check Aggregate predicates
This commit is contained in:
parent
c9159262d1
commit
5010496677
@ -1168,6 +1168,8 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {
|
||||
) {
|
||||
let tcx = self.tcx();
|
||||
|
||||
self.prove_aggregate_predicates(aggregate_kind, location);
|
||||
|
||||
match aggregate_kind {
|
||||
// tuple rvalue field type is always the type of the op. Nothing to check here.
|
||||
AggregateKind::Tuple => return,
|
||||
@ -1235,6 +1237,31 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {
|
||||
}
|
||||
}
|
||||
|
||||
fn prove_aggregate_predicates(
|
||||
&mut self,
|
||||
aggregate_kind: &AggregateKind<'tcx>,
|
||||
location: Location,
|
||||
) {
|
||||
let tcx = self.tcx();
|
||||
|
||||
let instantiated_predicates = match aggregate_kind {
|
||||
AggregateKind::Adt(def, _, substs, _) => {
|
||||
tcx.predicates_of(def.did).instantiate(tcx, substs)
|
||||
}
|
||||
|
||||
AggregateKind::Closure(def_id, substs) |
|
||||
AggregateKind::Generator(def_id, substs, _) => {
|
||||
tcx.predicates_of(*def_id).instantiate(tcx, substs.substs)
|
||||
}
|
||||
|
||||
AggregateKind::Array(_) |
|
||||
AggregateKind::Tuple => ty::InstantiatedPredicates::empty(),
|
||||
};
|
||||
|
||||
let predicates = self.normalize(&instantiated_predicates.predicates, location);
|
||||
self.prove_predicates(&predicates, location);
|
||||
}
|
||||
|
||||
fn prove_trait_ref(&mut self, trait_ref: ty::TraitRef<'tcx>, location: Location) {
|
||||
self.prove_predicates(
|
||||
&[
|
||||
|
28
src/test/compile-fail/nll/where_clauses_in_structs.rs
Normal file
28
src/test/compile-fail/nll/where_clauses_in_structs.rs
Normal file
@ -0,0 +1,28 @@
|
||||
// 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.
|
||||
|
||||
// compile-flags: -Z borrowck=mir -Z nll
|
||||
|
||||
#![allow(dead_code)]
|
||||
|
||||
use std::cell::Cell;
|
||||
|
||||
struct Foo<'a: 'b, 'b> {
|
||||
x: Cell<&'a u32>,
|
||||
y: Cell<&'b u32>,
|
||||
}
|
||||
|
||||
fn bar<'a, 'b>(x: Cell<&'a u32>, y: Cell<&'b u32>) {
|
||||
Foo { x, y };
|
||||
//~^ ERROR free region `'_#1r` does not outlive free region `'_#2r`
|
||||
//~| WARNING not reporting region error due to -Znll
|
||||
}
|
||||
|
||||
fn main() {}
|
Loading…
Reference in New Issue
Block a user