small cleanup

Author: spacejam

Cargo.toml

@@ -1,20 +1,18 @@
 [package]
 name = "crdt"
-description = "Common CRDTs implemented in Rust"
-version = "0.1.0"
+description = "Practical serializable CRDTs (counters, LWW, ORSWOT) implemented in Rust"
+version = "0.0.1"
 authors = ["Tyler Neely <[email protected]>"]
 license = "Apache-2.0"
 homepage = "https://github.com/spacejam/rust-crdt"
-keywords = ["crdt", "data structures", "distributed-systems"]
+keywords = ["crdt", "data structures", "distributed-systems", "vector clock", "orswot"]
 
 [[test]]
 
 name = "test"
 path = "test/test.rs"
 
 [dependencies]
-uuid = "0.1"
-protobuf = "1.0.18"
 rustc-serialize = "0.3.18"
 bincode = "0.5.1"
 

src/orswot.rs

@@ -1,4 +1,4 @@
-//! The `orswot` crate provides an implementation of the OR-Set without tombstones (ORSWOT).
+//! The `orswot` crate provides an implementation of the addition-biased OR-Set without tombstones (ORSWOT).
 //!
 //! # Examples
 //!
@@ -26,7 +26,6 @@ impl<Member: Ord + Clone, Actor: Ord + Clone> Orswot<Member, Actor> {
     pub fn add(&mut self, member: Member, actor: Actor) {
         let counter = self.clock.increment(actor.clone());
 
-        // TODO(tyler) riak_dt doesn't merge entry clocks on add.  Is this a bug?
         let mut entry_clock = VClock::new();
         entry_clock.witness(actor, counter).unwrap();
 

src/vclock.rs

@@ -114,8 +114,8 @@ impl<A: Ord + Clone> VClock<A> {
     #[inline]
     pub fn contains_descendent_element(&self, actor: &A, counter: &Counter) -> bool {
         self.dots.get(actor)
-              .map(|our_counter| our_counter >= counter)
-              .unwrap_or(false)
+                 .map(|our_counter| our_counter >= counter)
+                 .unwrap_or(false)
     }
 
     /// True if two vector clocks have diverged.