move ValueIndex up a level

Author: nikomatsakis

chalk-rust/src/solve/infer/mod.rs

@@ -40,6 +40,22 @@ pub type ParameterInferenceVariable = ParameterKind<TyInferenceVariable,
                                                     LifetimeInferenceVariable,
                                                     KrateInferenceVariable>;
 
+/// An index into the `InferenceTable.values` vector.
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct ValueIndex {
+    index: u32
+}
+
+impl ValueIndex {
+    pub fn new(value: usize) -> ValueIndex {
+        ValueIndex { index: value as u32 }
+    }
+
+    pub fn as_usize(&self) -> usize {
+        self.index as usize
+    }
+}
+
 impl InferenceTable {
     pub fn new() -> Self {
         InferenceTable {

chalk-rust/src/solve/infer/ty_var.rs

@@ -72,22 +72,6 @@ impl UnifyValue for TyInferenceValue {
     }
 }
 
-/// An index into the `InferenceTable.values` vector.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct ValueIndex {
-    index: u32
-}
-
-impl ValueIndex {
-    pub fn new(value: usize) -> ValueIndex {
-        ValueIndex { index: value as u32 }
-    }
-
-    pub fn as_usize(&self) -> usize {
-        self.index as usize
-    }
-}
-
 impl fmt::Debug for TyInferenceVariable {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error> {
         write!(fmt, "?{}", self.index)