chore: upgrade crossbeam-channel (#69)

* chore: upgrade crossbeam-channel
nervosnetwork · Dec 10, 2018 · 0cd755c · 0cd755c
1 parent 7fef14d
commit 0cd755c
Show file tree

Hide file tree

Showing 23 changed files with 146 additions and 169 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ clap = { version = "2" }
 serde = "1.0"
 serde_derive = "1.0"
 log = "0.4"
-crossbeam-channel = "0.2"
+crossbeam-channel = "0.3"
 ckb-util = { path = "util" }
 ckb-core = { path = "core" }
 ckb-chain = { path = "chain" }

diff --git a/chain/Cargo.toml b/chain/Cargo.toml
@@ -20,7 +20,7 @@ avl-merkle = { path = "../util/avl" }
 bigint = { git = "https://github.com/nervosnetwork/bigint" }
 lru-cache = { git = "https://github.com/nervosnetwork/lru-cache" }
 fnv = "1.0.3"
-crossbeam-channel = "0.2"
+crossbeam-channel = "0.3"
 
 [dev-dependencies]
 env_logger = "0.6"

diff --git a/chain/src/chain.rs b/chain/src/chain.rs
@@ -74,11 +74,11 @@ impl<CI: ChainIndex + 'static> ChainService<CI> {
         thread_builder
             .spawn(move || loop {
                 select! {
-                    recv(receivers.process_block_receiver, msg) => match msg {
-                        Some(Request { responder, arguments: block }) => {
-                            responder.send(self.process_block(block));
+                    recv(receivers.process_block_receiver) -> msg => match msg {
+                        Ok(Request { responder, arguments: block }) => {
+                            let _ = responder.send(self.process_block(block));
                         },
-                        None => {
+                        _ => {
                             error!(target: "chain", "process_block_receiver closed");
                             break;
                         },

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -13,7 +13,7 @@ hash = {path = "../util/hash"}
 crypto = {path = "../util/crypto"}
 ckb-time = { path = "../util/time" }
 bit-vec = "0.5.0"
-crossbeam-channel = "0.2"
+crossbeam-channel = "0.3"
 rayon = "1.0"
 ckb-util = { path = "../util" }
 fnv = "1.0.3"

diff --git a/core/src/service.rs b/core/src/service.rs
@@ -11,10 +11,10 @@ pub struct Request<A, R> {
 impl<A, R> Request<A, R> {
     pub fn call(sender: &Sender<Request<A, R>>, arguments: A) -> Option<R> {
         let (responder, response) = channel::bounded(ONESHOT_CHANNEL_SIZE);
-        sender.send(Request {
+        let _ = sender.send(Request {
             responder,
             arguments,
         });
-        response.recv()
+        response.recv().ok()
     }
 }
diff --git a/miner/Cargo.toml b/miner/Cargo.toml
@@ -18,7 +18,7 @@ flatbuffers = "0.5.0"
 rand = "0.6"
 serde = "1.0"
 serde_derive = "1.0"
-crossbeam-channel = "0.2"
+crossbeam-channel = "0.3"
 fnv = "1.0.3"
 jsonrpc = { git = "https://github.com/quake/rust-jsonrpc" }
 serde_json = "1.0"
diff --git a/miner/src/agent.rs b/miner/src/agent.rs
@@ -89,21 +89,21 @@ impl<CI: ChainIndex + 'static> Agent<CI> {
         thread_builder
             .spawn(move || loop {
                 select! {
-                    recv(new_uncle_receiver, msg) => match msg {
-                        Some(uncle_block) => {
+                    recv(new_uncle_receiver) -> msg => match msg {
+                        Ok(uncle_block) => {
                             let hash = uncle_block.header().hash();
                             self.candidate_uncles.insert(hash, uncle_block);
                         }
-                        None => {
+                        _ => {
                             error!(target: "miner", "new_uncle_receiver closed");
                             break;
                         }
-                    }
-                    recv(receivers.get_block_template_receiver, msg) => match msg {
-                        Some(Request { responder, arguments: (type_hash, max_tx, max_prop) }) => {
-                            responder.send(self.get_block_template(type_hash, max_tx, max_prop));
+                    },
+                    recv(receivers.get_block_template_receiver) -> msg => match msg {
+                        Ok(Request { responder, arguments: (type_hash, max_tx, max_prop) }) => {
+                            let _ = responder.send(self.get_block_template(type_hash, max_tx, max_prop));
                         },
-                        None => {
+                        _ => {
                             error!(target: "miner", "get_block_template_receiver closed");
                             break;
                         },

diff --git a/miner/src/client.rs b/miner/src/client.rs
@@ -45,7 +45,7 @@ impl Client {
                     if inner.as_ref().map_or(true, |old| is_new_job(&new, &old)) {
                         let mut write_guard = RwLockUpgradableReadGuard::upgrade(inner);
                         *write_guard = Some(new);
-                        self.new_job_tx.send(());
+                        let _ = self.new_job_tx.send(());
                     }
                 }
                 Err(e) => {

diff --git a/miner/src/miner.rs b/miner/src/miner.rs
@@ -47,7 +47,7 @@ impl Miner {
     fn mine_loop(&self, header: &RawHeader) -> Option<Seal> {
         let mut nonce: u64 = thread_rng().gen();
         loop {
-            if self.new_job_rx.try_recv().is_some() {
+            if self.new_job_rx.try_recv().is_ok() {
                 break None;
             }
             debug!(target: "miner", "mining header #{} with nonce {}", header.number(), nonce);

diff --git a/notify/Cargo.toml b/notify/Cargo.toml
@@ -8,5 +8,5 @@ authors = ["Nervos Core Dev <[email protected]>"]
 fnv = "1.0"
 ckb-util = { path = "../util" }
 ckb-core = { path = "../core" }
-crossbeam-channel = "0.2"
+crossbeam-channel = "0.3"
 log = "0.4"