Merge d03b9f2 into 0a930cd

tox-rs · Dec 27, 2020 · 63bf9a8 · 63bf9a8
2 parents 0a930cd + d03b9f2
commit 63bf9a8
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.1.1 (Dec 27, 2020)
+
+* Code cleanup (#441, #442)
+* Implement k-tree with force-k modification (#436, #443)
+
 # 0.1.0 (Oct 7, 2020)
 
 * Replace `parking_lot` mutex with `futures` mutex (#434)

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -5,10 +5,10 @@ publish = false
 edition = "2018"
 
 [dev-dependencies]
-tox_binary_io = { version = "0.1.0", path = "../tox_binary_io", features = ["sodium"] }
-tox_crypto = { version = "0.1.0", path = "../tox_crypto" }
-tox_packet = { version = "0.1.0", path = "../tox_packet" }
-tox_core = { version = "0.1.0", path = "../tox_core" }
+tox_binary_io = { version = "0.1.1", path = "../tox_binary_io", features = ["sodium"] }
+tox_crypto = { version = "0.1.1", path = "../tox_crypto" }
+tox_packet = { version = "0.1.1", path = "../tox_packet" }
+tox_core = { version = "0.1.1", path = "../tox_core" }
 
 log = "0.4"
 futures = { version = "0.3", default-features = false, features = ["std", "async-await"] }

diff --git a/tox/Cargo.toml b/tox/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tox"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
     "Zetok Zalbavar <zetok@openmailbox.org>",
     "Roman Proskuryakov <humbug@deeptown.org>",

diff --git a/tox_binary_io/Cargo.toml b/tox_binary_io/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tox_binary_io"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
     "Zetok Zalbavar <zetok@openmailbox.org>",
     "Roman Proskuryakov <humbug@deeptown.org>",

diff --git a/tox_core/Cargo.toml b/tox_core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tox_core"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
     "Zetok Zalbavar <zetok@openmailbox.org>",
     "Roman Proskuryakov <humbug@deeptown.org>",
@@ -17,9 +17,9 @@ license = "GPL-3.0+"
 edition = "2018"
 
 [dependencies]
-tox_binary_io = { version = "0.1.0", path = "../tox_binary_io" }
-tox_crypto = { version = "0.1.0", path = "../tox_crypto" }
-tox_packet = { version = "0.1.0", path = "../tox_packet" }
+tox_binary_io = { version = "0.1.1", path = "../tox_binary_io" }
+tox_crypto = { version = "0.1.1", path = "../tox_crypto" }
+tox_packet = { version = "0.1.1", path = "../tox_packet" }
 
 bytes = "0.5"
 futures = { version = "0.3", default-features = false, features = ["std", "async-await"] }

diff --git a/tox_core/src/dht/server_ext.rs b/tox_core/src/dht/server_ext.rs
@@ -159,7 +159,7 @@ mod tests {
 
         futures::select! {
             res = client_future.fuse() => res.unwrap(),
-            res = server_future.fuse() => (),
+            _ = server_future.fuse() => (),
         };
     }
 }
diff --git a/tox_crypto/Cargo.toml b/tox_crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tox_crypto"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
     "Zetok Zalbavar <zetok@openmailbox.org>",
     "Roman Proskuryakov <humbug@deeptown.org>",

diff --git a/tox_encryptsave/Cargo.toml b/tox_encryptsave/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tox_encryptsave"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
     "Zetok Zalbavar <zetok@openmailbox.org>",
     "Roman Proskuryakov <humbug@deeptown.org>",

diff --git a/tox_packet/Cargo.toml b/tox_packet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tox_packet"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
     "Zetok Zalbavar <zetok@openmailbox.org>",
     "Roman Proskuryakov <humbug@deeptown.org>",