From 6165555addfca573f1cc2b1863af82f1cffce057 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Fri, 16 May 2025 11:58:17 +1000
Subject: [PATCH] build(deps): bump Rust to 1.87.0 (#9159)

---
 rust/android-client-ffi/src/lib.rs           | 2 +-
 rust/apple-client-ffi/src/make_writer.rs     | 3 +--
 rust/bin-shared/src/network_changes/linux.rs | 4 ++--
 rust/connlib/snownet/src/node.rs             | 3 ---
 rust/connlib/tunnel/src/client.rs            | 2 +-
 rust/rust-toolchain.toml                     | 2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/rust/android-client-ffi/src/lib.rs b/rust/android-client-ffi/src/lib.rs
index b753a5e2d..47fb6953b 100644
--- a/rust/android-client-ffi/src/lib.rs
+++ b/rust/android-client-ffi/src/lib.rs
@@ -110,7 +110,7 @@ impl CallbackHandler {
                 &[JValue::Int(socket)],
             )
         })
-        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+        .map_err(io::Error::other)
     }
 }
 
diff --git a/rust/apple-client-ffi/src/make_writer.rs b/rust/apple-client-ffi/src/make_writer.rs
index 2a6ed0266..b9dc74f80 100644
--- a/rust/apple-client-ffi/src/make_writer.rs
+++ b/rust/apple-client-ffi/src/make_writer.rs
@@ -38,8 +38,7 @@ impl<'l> tracing_subscriber::fmt::MakeWriter<'l> for MakeWriter {
 
 impl io::Write for Writer<'_> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        let message =
-            std::str::from_utf8(buf).map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
+        let message = std::str::from_utf8(buf).map_err(io::Error::other)?;
 
         self.oslog.with_level(self.level, message);
 
diff --git a/rust/bin-shared/src/network_changes/linux.rs b/rust/bin-shared/src/network_changes/linux.rs
index 05fd9c84b..624676bc1 100644
--- a/rust/bin-shared/src/network_changes/linux.rs
+++ b/rust/bin-shared/src/network_changes/linux.rs
@@ -78,7 +78,7 @@ pub struct Worker {
 }
 
 enum Inner {
-    DBus(zbus::proxy::SignalStream<'static>),
+    DBus(Box<zbus::proxy::SignalStream<'static>>),
     DnsPoller(Interval),
     Null,
 }
@@ -106,7 +106,7 @@ impl Worker {
         let stream = proxy.receive_signal(member).await?;
         Ok(Self {
             just_started: true,
-            inner: Inner::DBus(stream),
+            inner: Inner::DBus(Box::new(stream)),
         })
     }
 
diff --git a/rust/connlib/snownet/src/node.rs b/rust/connlib/snownet/src/node.rs
index 0bb24aef8..bf72c4b11 100644
--- a/rust/connlib/snownet/src/node.rs
+++ b/rust/connlib/snownet/src/node.rs
@@ -804,7 +804,6 @@ where
     /// This heuristic might fail because we are also handling wireguard packets.
     /// Those are fully encrypted and thus any byte pattern may appear at the front of the packet.
     /// We can detect this by further checking the origin of the packet.
-    #[must_use]
     fn allocations_try_handle<'p>(
         &mut self,
         from: SocketAddr,
@@ -859,7 +858,6 @@ where
         }
     }
 
-    #[must_use]
     fn agents_try_handle(
         &mut self,
         from: SocketAddr,
@@ -892,7 +890,6 @@ where
         ControlFlow::Break(Ok(()))
     }
 
-    #[must_use]
     fn connections_try_handle(
         &mut self,
         from: SocketAddr,
diff --git a/rust/connlib/tunnel/src/client.rs b/rust/connlib/tunnel/src/client.rs
index 34f1c903f..c5966efa1 100644
--- a/rust/connlib/tunnel/src/client.rs
+++ b/rust/connlib/tunnel/src/client.rs
@@ -1061,7 +1061,7 @@ impl ClientState {
                     query: query_result.query,
                     message: query_result
                         .result
-                        .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("{e:#}"))),
+                        .map_err(|e| io::Error::other(format!("{e:#}"))),
                     transport: dns::Transport::Tcp { local, remote },
                 });
                 continue;
diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml
index 8009387dc..ec5737980 100644
--- a/rust/rust-toolchain.toml
+++ b/rust/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.86.0"
+channel = "1.87.0"
 components = ["rust-src", "rust-analyzer", "clippy"]
 targets = ["x86_64-unknown-linux-musl"]