update rand to 0.9 (#182)

* update rand to 0.9, tungstenite to 0.26

* clippy fix

* fmt code

Author: getong

Cargo.lock

@@ -31,7 +31,7 @@ crossbeam-utils = "0.8"
 log = "0.4"
 strum = { version = "0.24", features = ["derive"] }
 socket2 = { version = "0.5.1", features = ["all"], optional = true}
-tungstenite = { version = "0.22.0", features = ["url"], optional = true }
+tungstenite = { version = "0.26", features = ["url"], optional = true }
 url = { version = "2.2", optional = true }
 integer-encoding = "3.0.2"
 lazy_static = "1.4.0"
@@ -51,7 +51,7 @@ criterion = "0.4"
 fern = "0.6.0"
 chrono = { version = "0.4.24", features = ["clock"], default-features = false }
 test-case = "1.1.0"
-rand = "0.8"
+rand = "0.9"
 httparse = "1.3.5"
 doc-comment = "0.3"
 

Cargo.toml

@@ -139,8 +139,8 @@ fn latency_by_native_web_socket(c: &mut Criterion) {
         let message = vec![0xFF];
 
         b.iter(|| {
-            sender.write_message(Message::Binary(message.clone())).unwrap();
-            receiver.read_message().unwrap();
+            sender.send(Message::Binary(message.clone().into())).unwrap();
+            receiver.read().unwrap();
         });
     });
 }

benches/latency.rs

@@ -234,7 +234,7 @@ fn throughput_native_ws(packet_size: usize) {
                 let (mut sender, _) = ws_connect(Url::parse(&url_addr).unwrap()).unwrap();
                 let start_time = Instant::now();
                 while total_sent < EXPECTED_BYTES {
-                    sender.send(Message::Binary(message.clone())).unwrap();
+                    sender.send(Message::Binary(message.clone().into())).unwrap();
                     total_sent += message.len();
                 }
                 start_time

examples/throughput/main.rs

@@ -121,7 +121,7 @@ impl Remote for RemoteResource {
                 }
                 Err(err) => {
                     log::error!("TCP receive error: {}", err);
-                    break ReadStatus::Disconnected // should not happen
+                    break ReadStatus::Disconnected; // should not happen
                 }
             }
         }
@@ -144,13 +144,13 @@ impl Remote for RemoteResource {
                 Ok(bytes_sent) => {
                     total_bytes_sent += bytes_sent;
                     if total_bytes_sent == total_bytes {
-                        break SendStatus::Sent
+                        break SendStatus::Sent;
                     }
                 }
                 Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => continue,
                 Err(err) => {
                     log::error!("TCP receive error: {}", err);
-                    break SendStatus::ResourceNotFound // should not happen
+                    break SendStatus::ResourceNotFound; // should not happen
                 }
             }
         }

src/adapters/framed_tcp.rs

@@ -177,7 +177,7 @@ impl Remote for RemoteResource {
                 }
                 Err(err) => {
                     log::error!("TCP receive error: {}", err);
-                    break ReadStatus::Disconnected // should not happen
+                    break ReadStatus::Disconnected; // should not happen
                 }
             }
         }
@@ -195,7 +195,7 @@ impl Remote for RemoteResource {
                 Ok(bytes_sent) => {
                     total_bytes_sent += bytes_sent;
                     if total_bytes_sent == data.len() {
-                        break SendStatus::Sent
+                        break SendStatus::Sent;
                     }
                 }
                 Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => continue,
@@ -204,7 +204,7 @@ impl Remote for RemoteResource {
                 // a Event::Disconnection will be generated later.
                 Err(err) => {
                     log::error!("TCP receive error: {}", err);
-                    break SendStatus::ResourceNotFound // should not happen
+                    break SendStatus::ResourceNotFound; // should not happen
                 }
             }
         }
@@ -238,7 +238,7 @@ pub fn check_stream_ready(stream: &TcpStream) -> PendingStatus {
     // A multiplatform non-blocking way to determine if the TCP stream is connected:
     // Extracted from: https://github.com/tokio-rs/mio/issues/1486
     if let Ok(Some(_)) = stream.take_error() {
-        return PendingStatus::Disconnected
+        return PendingStatus::Disconnected;
     }
     match stream.peer_addr() {
         Ok(_) => PendingStatus::Ready,

src/adapters/tcp.rs

@@ -193,11 +193,11 @@ impl Remote for RemoteResource {
                 }
                 Err(ref err) if err.kind() == ErrorKind::ConnectionRefused => {
                     // Avoid ICMP generated error to be logged
-                    break ReadStatus::WaitNextEvent
+                    break ReadStatus::WaitNextEvent;
                 }
                 Err(err) => {
                     log::error!("UDP receive error: {}", err);
-                    break ReadStatus::WaitNextEvent // Should not happen
+                    break ReadStatus::WaitNextEvent; // Should not happen
                 }
             }
         }
@@ -262,15 +262,15 @@ impl LocalResource {
                     };
 
                     if !ingress_addresses.contains(&ingress_ip) {
-                        continue
+                        continue;
                     }
 
                     fn convert_sockaddr(addr: SockaddrStorage) -> Option<SocketAddr> {
                         if let Some(addr) = addr.as_sockaddr_in() {
-                            return Some(SocketAddr::V4((*addr).into()))
+                            return Some(SocketAddr::V4((*addr).into()));
                         }
                         if let Some(addr) = addr.as_sockaddr_in6() {
-                            return Some(SocketAddr::V6((*addr).into()))
+                            return Some(SocketAddr::V6((*addr).into()));
                         }
                         None
                     }
@@ -417,7 +417,7 @@ impl Local for LocalResource {
         #[cfg(target_os = "linux")]
         if let Some(ingress_addresses) = &self.ingress_addresses {
             self.accept_filtered(ingress_addresses, accept_remote);
-            return
+            return;
         }
 
         let buffer: MaybeUninit<[u8; MAX_LOCAL_PAYLOAD_LEN]> = MaybeUninit::uninit();
@@ -464,7 +464,7 @@ fn send_packet(data: &[u8], send_method: impl Fn(&[u8]) -> io::Result<usize>) ->
             }
             Err(err) => {
                 log::error!("UDP send error: {}", err);
-                break SendStatus::ResourceNotFound // should not happen
+                break SendStatus::ResourceNotFound; // should not happen
             }
         }
     }