Merge pull request rust-lang#183 from memoryruins/update-ena

Update ena to 0.10.1

Author: nikomatsakis

Cargo.lock

@@ -9,7 +9,7 @@ readme = "README.md"
 keywords = ["compiler", "traits", "prolog"]
 
 [dependencies]
-ena = "0.4"
+ena = "0.10.1"
 
 [dependencies.chalk-macros]
 version = "0.1.0"

chalk-solve/Cargo.toml

@@ -15,13 +15,13 @@ use self::var::*;
 
 #[derive(Clone)]
 pub struct InferenceTable {
-    unify: ena::UnificationTable<EnaVariable>,
+    unify: ena::InPlaceUnificationTable<EnaVariable>,
     vars: Vec<EnaVariable>,
     max_universe: UniverseIndex,
 }
 
 pub struct InferenceSnapshot {
-    unify_snapshot: ena::Snapshot<EnaVariable>,
+    unify_snapshot: ena::Snapshot<ena::InPlace<EnaVariable>>,
     max_universe: UniverseIndex,
     vars: Vec<EnaVariable>,
 }

chalk-solve/src/infer.rs

@@ -95,6 +95,8 @@ impl From<Lifetime> for InferenceValue {
 }
 
 impl UnifyValue for InferenceValue {
+    type Error = (InferenceValue, InferenceValue);
+
     fn unify_values(
         a: &InferenceValue,
         b: &InferenceValue,