OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #47322 - nikomatsakis:nll-ice, r=pnkfelix

Browse Source 
resolve type and region variables in "NLL dropck"

Fixes #47022.

r? @pnkfelix
This commit is contained in:
bors 2018-01-14 14:11:59 +00:00
commit adc9d86363
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/librustc_mir/borrow_check/nll/type_check/liveness.rs
View File

@ -214,6 +214,7 @@ impl<'gen, 'typeck, 'flow, 'gcx, 'tcx> TypeLivenessGenerator<'gen, 'typeck, 'flo
// associated types here and possibly recursively process. // associated types here and possibly recursively process.
for ty in dtorck_types { for ty in dtorck_types {
let ty = self.cx.normalize(&ty, location); let ty = self.cx.normalize(&ty, location);
let ty = self.cx.infcx.resolve_type_and_region_vars_if_possible(&ty);
match ty.sty { match ty.sty {
ty::TyParam(..) | ty::TyProjection(..) | ty::TyAnon(..) => { ty::TyParam(..) | ty::TyProjection(..) | ty::TyAnon(..) => {
let cause = Cause::DropVar(dropped_local, location); let cause = Cause::DropVar(dropped_local, location);

47
src/test/ui/nll/issue-47022.rs Normal file
View File

@ -0,0 +1,47 @@
// 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.
// must-compile-successfully
#![allow(warnings)]
#![feature(nll)]
struct LoadedObject {
bodies: Vec<Body>,
color: Color,
}
struct Body;
#[derive(Clone)]
struct Color;
struct Graphic {
color: Color,
}
fn convert(objects: Vec<LoadedObject>) -> (Vec<Body>, Vec<Graphic>) {
objects
.into_iter()
.flat_map(|LoadedObject { bodies, color, .. }| {
bodies.into_iter().map(move |body| {
(
body,
Graphic {
color: color.clone(),
},
)
})
})
.unzip()
}
fn main() {}