Use FnOnce and bump chashmap to 2.0.0.

#19

Author: ticki

chashmap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chashmap"
-version = "1.2.0"
+version = "2.0.0"
 authors = ["ticki <[email protected]>"]
 description = "Fast, concurrent hash maps with extensive API."
 repository = "https://github.com/ticki/tfs"

chashmap/src/lib.rs

@@ -752,8 +752,8 @@ impl<K: PartialEq + Hash, V> CHashMap<K, V> {
     /// This looks up `key`. If it exists, the reference to its value is passed through closure
     /// `update`.  If it doesn't exist, the result of closure `insert` is inserted.
     pub fn upsert<F, G>(&self, key: K, insert: F, update: G)
-        where F: Fn() -> V,
-              G: Fn(&mut V) {
+        where F: FnOnce() -> V,
+              G: FnOnce(&mut V) {
         // Expand and lock the table. We need to expand to ensure the bounds on the load factor.
         let lock = self.table.read();
         {
@@ -786,7 +786,7 @@ impl<K: PartialEq + Hash, V> CHashMap<K, V> {
     ///
     /// Note that if `f` returns `None`, the entry of key `key` is removed unconditionally.
     pub fn alter<F>(&self, key: K, f: F)
-        where F: Fn(Option<V>) -> Option<V> {
+        where F: FnOnce(Option<V>) -> Option<V> {
         // Expand and lock the table. We need to expand to ensure the bounds on the load factor.
         let lock = self.table.read();
         {

mlcr/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mlcr"
-version = "0.2.1"
+version = "0.2.0"
 authors = ["ticki <[email protected]>"]
 description = "An adaptive machine-learning-based cache tracker/replacement policy."
 repository = "https://github.com/ticki/tfs"