Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/kstat-macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
8 changes: 2 additions & 6 deletions lib/oxide-vpc/src/cfg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 { ipv4: _, .. } => {
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 { ipv6: _, .. } => {
u32::from(u16::MAX)
}
IpCfg::Ipv6(_) | IpCfg::DualStack { .. } => u32::from(u16::MAX),
_ => 0,
};
n_ipv4_ports + n_ipv6_ports
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.95.0"
channel = "1.96.0"
profile = "default"
2 changes: 1 addition & 1 deletion xde/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -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"