Merge pull request #11 from eddyb/none-of-you-are-free-of-default

Implement `Default` on `SnapshotVec`, `UnificationTable` and unification stores.

Cargo.toml

@@ -4,7 +4,7 @@ description = "Union-find, congruence closure, and other unification code. Based
 license = "MIT/Apache-2.0"
 homepage = "https://github.com/nikomatsakis/ena"
 repository = "https://github.com/nikomatsakis/ena"
-version = "0.9.3"
+version = "0.10.0"
 authors = ["Niko Matsakis <niko@alum.mit.edu>"]
 readme = "README.md"
 keywords = ["unification", "union-find"]

src/snapshot_vec.rs

@@ -75,13 +75,20 @@ pub trait SnapshotVecDelegate {
     fn reverse(values: &mut Vec<Self::Value>, action: Self::Undo);
 }
 
-impl<D: SnapshotVecDelegate> SnapshotVec<D> {
-    pub fn new() -> SnapshotVec<D> {
+// HACK(eddyb) manual impl avoids `Default` bound on `D`.
+impl<D: SnapshotVecDelegate> Default for SnapshotVec<D> {
+    fn default() -> Self {
         SnapshotVec {
             values: Vec::new(),
             undo_log: Vec::new(),
         }
     }
+}
+
+impl<D: SnapshotVecDelegate> SnapshotVec<D> {
+    pub fn new() -> Self {
+        Self::default()
+    }
 
     pub fn with_capacity(c: usize) -> SnapshotVec<D> {
         SnapshotVec {

src/unify/backing_vec.rs

@@ -12,13 +12,13 @@ type Key<S> = <S as UnificationStore>::Key;
 /// Largely internal trait implemented by the unification table
 /// backing store types. The most common such type is `InPlace`,
 /// which indicates a standard, mutable unification table.
-pub trait UnificationStore: ops::Index<usize, Output = VarValue<Key<Self>>> + Clone {
+pub trait UnificationStore:
+    ops::Index<usize, Output = VarValue<Key<Self>>> + Clone + Default
+{
     type Key: UnifyKey<Value = Self::Value>;
     type Value: UnifyValue;
     type Snapshot;
 
-    fn new() -> Self;
-
     fn start_snapshot(&mut self) -> Self::Snapshot;
 
     fn rollback_to(&mut self, snapshot: Self::Snapshot);
@@ -51,16 +51,18 @@ pub struct InPlace<K: UnifyKey> {
     values: sv::SnapshotVec<Delegate<K>>
 }
 
+// HACK(eddyb) manual impl avoids `Default` bound on `K`.
+impl<K: UnifyKey> Default for InPlace<K> {
+    fn default() -> Self {
+        InPlace { values: sv::SnapshotVec::new() }
+    }
+}
+
 impl<K: UnifyKey> UnificationStore for InPlace<K> {
     type Key = K;
     type Value = K::Value;
     type Snapshot = sv::Snapshot;
 
-    #[inline]
-    fn new() -> Self {
-        InPlace { values: sv::SnapshotVec::new() }
-    }
-
     #[inline]
     fn start_snapshot(&mut self) -> Self::Snapshot {
         self.values.start_snapshot()
@@ -132,17 +134,20 @@ pub struct Persistent<K: UnifyKey> {
     values: DVec<VarValue<K>>
 }
 
+// HACK(eddyb) manual impl avoids `Default` bound on `K`.
+#[cfg(feature = "persistent")]
+impl<K: UnifyKey> Default for Persistent<K> {
+    fn default() -> Self {
+        Persistent { values: DVec::new() }
+    }
+}
+
 #[cfg(feature = "persistent")]
 impl<K: UnifyKey> UnificationStore for Persistent<K> {
     type Key = K;
     type Value = K::Value;
     type Snapshot = Self;
 
-    #[inline]
-    fn new() -> Self {
-        Persistent { values: DVec::new() }
-    }
-
     #[inline]
     fn start_snapshot(&mut self) -> Self::Snapshot {
         self.clone()

src/unify/mod.rs

@@ -174,7 +174,7 @@ pub struct VarValue<K: UnifyKey> { // FIXME pub
 ///     cloning the table is an O(1) operation.
 ///   - This implies that ordinary operations are quite a bit slower though.
 ///   - Requires the `persistent` feature be selected in your Cargo.toml file.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct UnificationTable<S: UnificationStore> {
     /// Indicates the current value of each key.
     values: S,
@@ -237,9 +237,7 @@ impl<K: UnifyKey> VarValue<K> {
 
 impl<S: UnificationStore> UnificationTable<S> {
     pub fn new() -> Self {
-        UnificationTable {
-            values: S::new()
-        }
+        Self::default()
     }
 
     /// Starts a new snapshot. Each snapshot must be either