Imported Upstream version 1.0.0-alpha.2

[rustc.git] / src / librustc / middle / fast_reject.rs

diff --git a/src/librustc/middle/fast_reject.rs b/src/librustc/middle/fast_reject.rs
index 42bc70b5b561fd12b57db8ffd50ea559f078fd16..b33e5a802f1582f6a639431938abaf3c026d8709 100644 (file)
--- a/src/librustc/middle/fast_reject.rs
+++ b/src/librustc/middle/fast_reject.rs
@@ -28,7 +28,7 @@ pub enum SimplifiedType {
     TupleSimplifiedType(uint),
     TraitSimplifiedType(ast::DefId),
     StructSimplifiedType(ast::DefId),
-    UnboxedClosureSimplifiedType(ast::DefId),
+    ClosureSimplifiedType(ast::DefId),
     FunctionSimplifiedType(uint),
     ParameterSimplifiedType,
 }
@@ -74,8 +74,8 @@ pub fn simplify_type(tcx: &ty::ctxt,
             let def_id = tcx.lang_items.owned_box().unwrap();
             Some(StructSimplifiedType(def_id))
         }
-        ty::ty_unboxed_closure(def_id, _, _) => {
-            Some(UnboxedClosureSimplifiedType(def_id))
+        ty::ty_closure(def_id, _, _) => {
+            Some(ClosureSimplifiedType(def_id))
         }
         ty::ty_tup(ref tys) => {
             Some(TupleSimplifiedType(tys.len()))