Upgrading smol to 1.2 (#25)

Author: brosander

Cargo.toml

@@ -26,7 +26,7 @@ log = "0.4"
 mio = "0.6"
 pin-project = "0.4"
 pcap-sys = "0.1"
-smol = "0.1"
+smol = "1.2"
 thiserror = "1.0"
 
 [dev-dependencies]

benches/bench_capture.rs

@@ -23,7 +23,7 @@ fn bench_stream_from_large_file(b: &mut Bencher) {
         let mut cfg = Config::default();
         cfg.with_max_packets_read(5000);
 
-        let packets = smol::run(async move {
+        let packets = smol::block_on(async move {
             let packet_provider =
                 PacketStream::new(Config::default(), std::sync::Arc::clone(&handle))
                     .expect("Failed to build");
@@ -82,7 +82,7 @@ fn bench_stream_next_from_large_file_bridge(b: &mut Bencher) {
             .map(|h| PacketStream::new(Config::default(), h).unwrap())
             .collect();
 
-        let packets = smol::run(async move {
+        let packets = smol::block_on(async move {
             let packet_provider =
                 BridgeStream::new(streams, Config::default().buffer_for().clone(), 0)
                     .expect("Failed to build");
@@ -125,7 +125,7 @@ fn bench_stream_next_from_large_file(b: &mut Bencher) {
         let mut cfg = Config::default();
         cfg.with_max_packets_read(5000);
 
-        let packets = smol::run(async move {
+        let packets = smol::block_on(async move {
             let packet_provider =
                 PacketStream::new(Config::default(), std::sync::Arc::clone(&handle))
                     .expect("Failed to build");

src/bridge_stream.rs

@@ -44,7 +44,7 @@ impl<E: Sync + Send, T: Stream<Item = StreamItem<E>> + Sized + Unpin> Future
             let polled = Pin::new(&mut stream).poll_next(cx);
             match polled {
                 Poll::Pending => {
-                    std::mem::replace(this.stream, Some(stream));
+                    let _old_stream = std::mem::replace(this.stream, Some(stream));
                     return Poll::Pending;
                 }
                 Poll::Ready(Some(t)) => {
@@ -325,7 +325,7 @@ mod tests {
         let packet_provider = BridgeStream::new(vec![packet_stream], Duration::from_millis(100), 2)
             .expect("Failed to build");
 
-        let packets = smol::run(async move {
+        let packets = smol::block_on(async move {
             let fut_packets = packet_provider.collect::<Vec<_>>();
             let packets: Vec<_> = fut_packets
                 .await
@@ -382,7 +382,7 @@ mod tests {
         let packet_provider = BridgeStream::new(vec![packet_stream], Duration::from_millis(100), 2)
             .expect("Failed to build");
 
-        let packets = smol::run(async move {
+        let packets = smol::block_on(async move {
             let fut_packets = async move {
                 let mut packet_provider = packet_provider.boxed();
                 let mut packets = vec![];
@@ -469,7 +469,7 @@ mod tests {
         let stream1 = futures::stream::iter(vec![item1]);
         let stream2 = futures::stream::iter(vec![item2]);
 
-        let result = smol::run(async move {
+        let result = smol::block_on(async move {
             let bridge = BridgeStream::new(vec![stream1, stream2], Duration::from_millis(100), 0);
 
             let result = bridge

src/lib.rs

@@ -9,7 +9,7 @@
 //!
 //! fn main() {
 //!     let handle = Handle::lookup().expect("No handle created");
-//!     smol::run(async move {
+//!     smol::block_on(async move {
 //!         let mut provider = PacketStream::new(Config::default(), Arc::clone(&handle))
 //!             .expect("Could not create provider")
 //!             .boxed();
@@ -64,7 +64,7 @@ mod tests {
         let mut cfg = Config::default();
         cfg.with_max_packets_read(5000);
 
-        let packets = smol::run(async move {
+        let packets = smol::block_on(async move {
             let packet_provider =
                 PacketStream::new(Config::default(), std::sync::Arc::clone(&handle))
                     .expect("Failed to build");

src/packet/future.rs

@@ -76,7 +76,7 @@ async fn poll_ready(
 impl DispatchArgs {
     async fn poll(&self, timeout: Option<Duration>) -> Result<InterfaceReady, Error> {
         trace!("Polling FD with timeout {:?}", timeout);
-        smol::Task::blocking(poll_ready(self.fd.clone(), timeout)).await
+        smol::block_on(poll_ready(self.fd.clone(), timeout))
     }
 }
 

src/stream.rs

@@ -117,7 +117,7 @@ mod tests {
         let handle = Handle::file_capture(pcap_path.to_str().expect("No path found"))
             .expect("No handle created");
 
-        let packets = smol::run(async move {
+        let packets = smol::block_on(async move {
             let packet_provider =
                 PacketStream::new(Config::default(), Arc::clone(&handle)).expect("Failed to build");
             let fut_packets = packet_provider.collect::<Vec<_>>();
@@ -170,7 +170,7 @@ mod tests {
         let handle = Handle::file_capture(pcap_path.to_str().expect("No path found"))
             .expect("No handle created");
 
-        let packets = smol::run(async move {
+        let packets = smol::block_on(async move {
             let packet_provider =
                 PacketStream::new(Config::default(), Arc::clone(&handle)).expect("Failed to build");
             let fut_packets = packet_provider.collect::<Vec<_>>();
@@ -200,7 +200,7 @@ mod tests {
 
         info!("Testing against {:?}", pcap_path);
 
-        let packets = smol::run(async move {
+        let packets = smol::block_on(async move {
             let handle = Handle::file_capture(pcap_path.to_str().expect("No path found"))
                 .expect("No handle created");
 
@@ -244,7 +244,7 @@ mod tests {
 
         let mut stream = stream.unwrap();
 
-        smol::run(async move { stream.next().await })
+        smol::block_on(async move { stream.next().await })
             .unwrap()
             .unwrap();
     }