Update toolchain to alleviate downstream rust-lang/rust#80691

Also removes expect_none usages as it has been removed and recommended to be replaced with asserts by the compiler devs

Author: Dessix

rust-toolchain

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2021-03-15"
+channel = "nightly-2021-04-17"

snocat-cli/src/client.rs

@@ -151,9 +151,12 @@ pub async fn client_main(config: ClientArgs) -> Result<()> {
     let add_new_connection = move |pair: BoxedTunnelPair<'static>| -> u32 {
       let connection_id = current_connection_id;
       current_connection_id += 1;
-      connections
-        .attach_stream(connection_id, stream::once(future::ready(pair)).boxed())
-        .expect_none("Connection IDs must be unique");
+      assert!(
+        connections
+          .attach_stream(connection_id, stream::once(future::ready(pair)).boxed())
+          .is_none(),
+        "Connection IDs must be unique"
+      );
       connection_id
     };
     (add_new_connection, connections_handle)

snocat-cli/src/main.rs

@@ -3,9 +3,7 @@
 #![feature(nll)]
 #![feature(async_closure)]
 #![feature(backtrace)]
-#![feature(debug_non_exhaustive)]
 #![feature(label_break_value)]
-#![feature(option_expect_none)]
 #![allow(dead_code)]
 #![warn(unused_imports)]
 

snocat/src/common/protocol/traits.rs

@@ -217,16 +217,19 @@ impl TunnelRegistry for InMemoryTunnelRegistry {
       if name.is_some() && tunnels.iter().any(|(_id, record)| record.name == name) {
         return Err(TunnelRegistrationError::NameOccupied(name.unwrap()));
       }
-      tunnels
-        .insert(
-          tunnel_id,
-          TunnelRecord {
-            id: tunnel_id,
-            name: name,
-            tunnel,
-          },
-        )
-        .expect_none("TunnelId overlap despite locked map where contains_key returned false");
+      assert!(
+        tunnels
+          .insert(
+            tunnel_id,
+            TunnelRecord {
+              id: tunnel_id,
+              name: name,
+              tunnel,
+            },
+          )
+          .is_none(),
+        "TunnelId overlap despite locked map where contains_key returned false"
+      );
       Ok(())
     }
     .boxed()

snocat/src/common/tunnel_source/mod.rs

@@ -251,12 +251,11 @@ mod tests {
     let a = stream::iter(vec!['a']).boxed();
     let b = stream::iter(vec!['b']).boxed();
     let c = stream::iter(vec!['c']).boxed();
-    set
-      .attach_stream(1u32, a)
-      .expect_none("Must attach to blank");
-    set
-      .attach_stream(2u32, b)
-      .expect_none("Must attach to non-blank with new key");
+    assert!(set.attach_stream(1u32, a).is_none(), "Must attach to blank");
+    assert!(
+      set.attach_stream(2u32, b).is_none(),
+      "Must attach to non-blank with new key"
+    );
     let mut replaced_b = set
       .attach_stream(2u32, c)
       .expect("Must overwrite keys and return an old one");
@@ -288,12 +287,11 @@ mod tests {
     let a = stream::iter(vec!['a']).boxed();
     let b = stream::iter(vec!['b']).boxed();
     let c = stream::iter(vec!['c']).boxed();
-    set
-      .attach_stream(1u32, a)
-      .expect_none("Must attach to blank");
-    set
-      .attach_stream(2u32, b)
-      .expect_none("Must attach to non-blank with new key");
+    assert!(set.attach_stream(1u32, a).is_none(), "Must attach to blank");
+    assert!(
+      set.attach_stream(2u32, b).is_none(),
+      "Must attach to non-blank with new key"
+    );
     set
       .attach_stream(2u32, c)
       .expect("Must replace existing keys");
@@ -311,13 +309,12 @@ mod tests {
     use std::sync::Arc;
     let set = Arc::new(DynamicStreamSet::<u32, i32>::new());
     let a = stream::iter(vec![1, 2, 3]).boxed();
-    set
-      .attach_stream(1u32, a)
-      .expect_none("Must attach to blank");
+    assert!(set.attach_stream(1u32, a).is_none(), "Must attach to blank");
     let collected = set.handle().collect::<Vec<_>>().await;
     assert_eq!(collected.as_slice(), &[(1, 1), (1, 2), (1, 3)]);
-    set
-      .detach(&1u32)
-      .expect_none("Must have already detached if polled to empty");
+    assert!(
+      set.detach(&1u32).is_none(),
+      "Must have already detached if polled to empty"
+    );
   }
 }

snocat/src/lib.rs

@@ -3,12 +3,9 @@
 #![feature(nll)]
 #![feature(async_closure)]
 #![feature(backtrace)]
-#![feature(debug_non_exhaustive)]
 #![feature(drain_filter)]
 #![feature(label_break_value)]
 #![feature(never_type)]
-#![feature(option_expect_none)]
-#![feature(or_patterns)]
 #![feature(try_blocks)]
 #![feature(type_ascription)]
 #![allow(dead_code)]