Update dependencies

Cargo.toml

@@ -65,6 +65,8 @@ hex = "0.3.1"
 deflate = {version="0.7.17", features=["gzip"]}
 capturing-glob = "0.1.0"
 
+[workspace]
+
 [dependencies.indexed_log]
 path = "./indexed_log"
 

src/daemon/fetch.rs

@@ -10,7 +10,8 @@ use futures::{Future, Stream, Sink, Async, AsyncSink};
 use futures::future::{FutureResult, ok};
 use futures::sync::mpsc::UnboundedReceiver;
 use futures::sync::oneshot;
-use rand::{thread_rng, Rng, sample};
+use rand::{thread_rng, Rng};
+use rand::seq::sample_iter;
 use tokio_core::reactor::Timeout;
 use tokio_core::net::{TcpStream, TcpStreamNew};
 use valuable_futures::{Supply, StateMachine, Async as A, Async as VAsync};
@@ -468,11 +469,11 @@ impl Prefetch {
                 None
             };
             // Issue a new connection
-            let addr = sample(&mut thread_rng(), peers.iter()
+            let addr = sample_iter(&mut thread_rng(), peers.iter()
                 .filter_map(|id| get_addr(&ctx.shared, id))
                 .filter(|&a| !self.blacklist.is_failing(a))
                 .filter(|a| cur.map(|s| !s.contains(a)).unwrap_or(true)),
-                1);
+                1).unwrap_or_else(|v| v);
             if let Some(addr) = addr.into_iter().next() {
                 self.fetching.push_back((FetchContext {
                     started: Instant::now(),

verwalter_config/Cargo.toml

@@ -12,7 +12,7 @@ authors = ["Paul Colomiets <paul@colomiets.name>"]
 
 [dependencies]
 quire = "0.3.1"
-log = "0.3.2"
+log = "0.4.1"
 serde = "1.0.0"
 serde_derive = "1.0.0"
 serde_json = "1.0.0"