From 2b2a11363819176a37e70b996405ce226f533c7b Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Tue, 11 Aug 2015 13:43:29 -0400 Subject: [PATCH] check/wf.rs: change to use correct span and older WF algorithm; at the time I reinstituted the old code, I hadn't given up yet and brought back the implicator. --- src/librustc_typeck/check/wf.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/librustc_typeck/check/wf.rs b/src/librustc_typeck/check/wf.rs index 21f48d37799e..47eb1f472c31 100644 --- a/src/librustc_typeck/check/wf.rs +++ b/src/librustc_typeck/check/wf.rs @@ -178,11 +178,8 @@ impl<'ccx, 'tcx> CheckTypeWellFormedVisitor<'ccx, 'tcx> { } } - let field_tys: Vec = - variants.iter().flat_map(|v| v.fields.iter().map(|f| f.ty)).collect(); - - for &field_ty in &field_tys { - fcx.register_wf_obligation(field_ty, item.span, traits::MiscObligation); + for field in variants.iter().flat_map(|v| v.fields.iter()) { + fcx.register_old_wf_obligation(field.ty, field.span, traits::MiscObligation); } }); }