From 3e9c486181ef17a74a3521408f6cd42f93c4f90d Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Fri, 19 Jun 2026 04:27:56 +0000
Subject: [PATCH 1/3] Update dependency rust

---
 rust-toolchain.toml     | 2 +-
 xde/rust-toolchain.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index f92020c6..ce98f164 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.95.0"
+channel = "1.96.0"
 profile = "default"
diff --git a/xde/rust-toolchain.toml b/xde/rust-toolchain.toml
index 89c286e8..2794cdb7 100644
--- a/xde/rust-toolchain.toml
+++ b/xde/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2026-04-01"
+channel = "nightly-2026-06-19"
 target = "x86_64-unknown-illumos"
 components = [ "clippy", "rustfmt", "rust-src" ]
 profile = "minimal"

From 98b1e8d29ec68e1f22a3833ea035bdab99f0d9f9 Mon Sep 17 00:00:00 2001
From: Kyle Simpson <kyle@oxide.computer>
Date: Fri, 19 Jun 2026 10:06:31 +0100
Subject: [PATCH 2/3] Nightly clippy fixes.

---
 crates/kstat-macro/src/lib.rs | 2 +-
 lib/oxide-vpc/src/cfg.rs      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/kstat-macro/src/lib.rs b/crates/kstat-macro/src/lib.rs
index f2f4edd3..100aeadd 100644
--- a/crates/kstat-macro/src/lib.rs
+++ b/crates/kstat-macro/src/lib.rs
@@ -54,7 +54,7 @@ pub fn derive_kstat_provider(input: TokenStream) -> TokenStream {
                 named.into_iter().collect()
             }
 
-            syn::Fields::Unnamed(FieldsUnnamed { unnamed: _, .. }) => {
+            syn::Fields::Unnamed(FieldsUnnamed { .. }) => {
                 panic!("A KStatProvider cannot have unnamed fields");
             }
 
diff --git a/lib/oxide-vpc/src/cfg.rs b/lib/oxide-vpc/src/cfg.rs
index 53d6d814..880f0849 100644
--- a/lib/oxide-vpc/src/cfg.rs
+++ b/lib/oxide-vpc/src/cfg.rs
@@ -206,13 +206,13 @@ impl VpcCfg {
     // addresses.
     pub fn required_nat_space(&self) -> u32 {
         let n_ipv4_ports = match &self.ip_cfg {
-            IpCfg::Ipv4(_) | IpCfg::DualStack { ipv4: _, .. } => {
+            IpCfg::Ipv4(_) | IpCfg::DualStack { .. } => {
                 u32::from(u16::MAX)
             }
             _ => 0,
         };
         let n_ipv6_ports = match &self.ip_cfg {
-            IpCfg::Ipv6(_) | IpCfg::DualStack { ipv6: _, .. } => {
+            IpCfg::Ipv6(_) | IpCfg::DualStack { .. } => {
                 u32::from(u16::MAX)
             }
             _ => 0,

From 2d39e9716319d602429e771c12b3c6628589c63b Mon Sep 17 00:00:00 2001
From: Kyle Simpson <kyle@oxide.computer>
Date: Fri, 19 Jun 2026 10:13:03 +0100
Subject: [PATCH 3/3] ...

---
 lib/oxide-vpc/src/cfg.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/oxide-vpc/src/cfg.rs b/lib/oxide-vpc/src/cfg.rs
index 880f0849..4324d901 100644
--- a/lib/oxide-vpc/src/cfg.rs
+++ b/lib/oxide-vpc/src/cfg.rs
@@ -206,15 +206,11 @@ impl VpcCfg {
     // addresses.
     pub fn required_nat_space(&self) -> u32 {
         let n_ipv4_ports = match &self.ip_cfg {
-            IpCfg::Ipv4(_) | IpCfg::DualStack { .. } => {
-                u32::from(u16::MAX)
-            }
+            IpCfg::Ipv4(_) | IpCfg::DualStack { .. } => u32::from(u16::MAX),
             _ => 0,
         };
         let n_ipv6_ports = match &self.ip_cfg {
-            IpCfg::Ipv6(_) | IpCfg::DualStack { .. } => {
-                u32::from(u16::MAX)
-            }
+            IpCfg::Ipv6(_) | IpCfg::DualStack { .. } => u32::from(u16::MAX),
             _ => 0,
         };
         n_ipv4_ports + n_ipv6_ports