about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2016-01-05 05:29:40 -0500
committerNiko Matsakis <niko@alum.mit.edu>2016-01-16 05:22:32 -0500
commit3db82d1a4eb89b9f0aa25df8b66f5c42ab4fcd43 (patch)
tree00d54111e7059957b0f5cbe356aea40b031d5f6e
parent20e088c4e2bb905d69945fd0729cc5b3668b5dce (diff)
downloadrust-3db82d1a4eb89b9f0aa25df8b66f5c42ab4fcd43.tar.gz
rust-3db82d1a4eb89b9f0aa25df8b66f5c42ab4fcd43.zip
Fix bug in new stall checking code, it should consider integer variables
too.
-rw-r--r--src/librustc/middle/traits/fulfill.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/middle/traits/fulfill.rs b/src/librustc/middle/traits/fulfill.rs
index a13cc141608..97656ecf6ae 100644
--- a/src/librustc/middle/traits/fulfill.rs
+++ b/src/librustc/middle/traits/fulfill.rs
@@ -396,7 +396,7 @@ fn process_predicate1<'a,'tcx>(selcx: &mut SelectionContext<'a,'tcx>,
                         .map(|t| selcx.infcx().resolve_type_vars_if_possible(t))
                         .filter(|t| t.has_infer_types())
                         .flat_map(|t| t.walk())
-                        .filter(|t| t.is_ty_var())
+                        .filter(|t| match t.sty { ty::TyInfer(_) => true, _ => false })
                         .collect();
 
                     debug!("process_predicate: pending obligation {:?} now stalled on {:?}",