From c9d958d30974daec880edb90af1f5a85191df8e7 Mon Sep 17 00:00:00 2001
From: k-nasa <htilcs1115@gmail.com>
Date: Sun, 27 Oct 2019 18:46:24 +0900
Subject: [PATCH] $cargo fix -Z unstable-options --clippy --features unstable

---
 examples/a-chat/main.rs   | 2 +-
 examples/a-chat/server.rs | 2 +-
 tests/rwlock.rs           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/a-chat/main.rs b/examples/a-chat/main.rs
index ced7cac2..89e5e2b6 100644
--- a/examples/a-chat/main.rs
+++ b/examples/a-chat/main.rs
@@ -8,6 +8,6 @@ fn main() -> Result<()> {
     match (args.nth(1).as_ref().map(String::as_str), args.next()) {
         (Some("client"), None) => client::main(),
         (Some("server"), None) => server::main(),
-        _ => Err("Usage: a-chat [client|server]")?,
+        _ => Err("Usage: a-chat [client|server]".into()),
     }
 }
diff --git a/examples/a-chat/server.rs b/examples/a-chat/server.rs
index 77ebfd1e..e049a490 100644
--- a/examples/a-chat/server.rs
+++ b/examples/a-chat/server.rs
@@ -45,7 +45,7 @@ async fn connection_loop(mut broker: Sender<Event>, stream: TcpStream) -> Result
     let mut lines = reader.lines();
 
     let name = match lines.next().await {
-        None => Err("peer disconnected immediately")?,
+        None => return Err("peer disconnected immediately".into()),
         Some(line) => line?,
     };
     let (_shutdown_sender, shutdown_receiver) = mpsc::unbounded::<Void>();
diff --git a/tests/rwlock.rs b/tests/rwlock.rs
index ff25e862..370dcb9f 100644
--- a/tests/rwlock.rs
+++ b/tests/rwlock.rs
@@ -13,7 +13,7 @@ use futures::channel::mpsc;
 /// Generates a random number in `0..n`.
 pub fn random(n: u32) -> u32 {
     thread_local! {
-        static RNG: Cell<Wrapping<u32>> = Cell::new(Wrapping(1406868647));
+        static RNG: Cell<Wrapping<u32>> = Cell::new(Wrapping(1_406_868_647));
     }
 
     RNG.with(|rng| {