bump MSRV and move to editon2024

Author: dignifiedquire

.github/workflows/ci.yaml

@@ -16,7 +16,7 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: -Dwarnings
   RUSTDOCFLAGS: -Dwarnings
-  MSRV: "1.81"
+  MSRV: "1.85"
   SCCACHE_CACHE_SIZE: "10G"
   IROH_FORCE_STAGING_RELAYS: "1"
 

netwatch/Cargo.toml

@@ -10,7 +10,7 @@ keywords = ["networking", "interfaces"]
 edition = "2021"
 
 # Sadly this also needs to be updated in .github/workflows/ci.yml
-rust-version = "1.81"
+rust-version = "1.85"
 
 [lints]
 workspace = true

portmapper/Cargo.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/n0-computer/net-tools"
 keywords = ["portmapping", "pmp", "pcp", "upnp"]
 
 # Sadly this also needs to be updated in .github/workflows/ci.yml
-rust-version = "1.81"
+rust-version = "1.85"
 
 [lints]
 workspace = true

portmapper/src/current_mapping.rs

@@ -175,7 +175,7 @@ impl<M: Mapping> futures_lite::Stream for CurrentMapping<M> {
         mut self: Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> Poll<Option<Self::Item>> {
-        self.as_mut().poll(cx).map(Some)
+        (*self.as_mut()).poll(cx).map(Some)
     }
 }
 
@@ -202,8 +202,7 @@ mod tests {
     #[tokio::test]
     #[ntest::timeout(2500)]
     async fn report_renew_expire_report() {
-        const TEST_PORT: NonZeroU16 = // SAFETY: it's clearly non zero
-            unsafe { NonZeroU16::new_unchecked(9586) };
+        const TEST_PORT: NonZeroU16 = NonZeroU16::new(9586).unwrap();
         const TEST_IP: std::net::Ipv4Addr = std::net::Ipv4Addr::LOCALHOST;
         let (mut c, mut watcher) = CurrentMapping::<M>::new(Default::default());
         let now = std::time::Instant::now();