[meta] update rust toolchain to 1.91.1 (#9522)

Rust 1.92.0 unfortunately runs into
rust-lang/rust#147648. Note that we need Rust
1.91.1 specifically for rust-lang/rust#148322,
not 1.91.0.

Author: sunshowers

Cargo.lock

@@ -578,13 +578,16 @@ impl ByteCount {
 
 impl Display for ByteCount {
     fn fmt(&self, f: &mut Formatter<'_>) -> FormatResult {
-        if self.to_bytes() >= TiB && self.to_bytes() % TiB == 0 {
+        if self.to_bytes() >= TiB && self.to_bytes().is_multiple_of(TiB) {
             write!(f, "{} TiB", self.to_whole_tebibytes())
-        } else if self.to_bytes() >= GiB && self.to_bytes() % GiB == 0 {
+        } else if self.to_bytes() >= GiB && self.to_bytes().is_multiple_of(GiB)
+        {
             write!(f, "{} GiB", self.to_whole_gibibytes())
-        } else if self.to_bytes() >= MiB && self.to_bytes() % MiB == 0 {
+        } else if self.to_bytes() >= MiB && self.to_bytes().is_multiple_of(MiB)
+        {
             write!(f, "{} MiB", self.to_whole_mebibytes())
-        } else if self.to_bytes() >= KiB && self.to_bytes() % KiB == 0 {
+        } else if self.to_bytes() >= KiB && self.to_bytes().is_multiple_of(KiB)
+        {
             write!(f, "{} KiB", self.to_whole_kibibytes())
         } else {
             write!(f, "{} B", self.to_bytes())

common/src/api/external/mod.rs

@@ -195,7 +195,7 @@ impl<T: Ip> SourceNatConfig<T> {
         first_port: u16,
         last_port: u16,
     ) -> Result<Self, SourceNatConfigError> {
-        if first_port % NUM_SOURCE_NAT_PORTS == 0
+        if first_port.is_multiple_of(NUM_SOURCE_NAT_PORTS)
             && last_port
                 .checked_sub(first_port)
                 .and_then(|diff| diff.checked_add(1))

common/src/api/internal/shared/external_ip/mod.rs

@@ -77,7 +77,7 @@ impl SourceNatConfig {
         first_port: u16,
         last_port: u16,
     ) -> Result<Self, SourceNatConfigError> {
-        if first_port % NUM_SOURCE_NAT_PORTS == 0
+        if first_port.is_multiple_of(NUM_SOURCE_NAT_PORTS)
             && last_port
                 .checked_sub(first_port)
                 .and_then(|diff| diff.checked_add(1))

common/src/api/internal/shared/external_ip/v1.rs

@@ -62,5 +62,5 @@ pub fn align_reservoir_size(size_bytes: u64) -> u64 {
 }
 
 pub fn reservoir_size_is_aligned(size_bytes: u64) -> bool {
-    (size_bytes % RESERVOIR_SZ_ALIGN) == 0
+    size_bytes.is_multiple_of(RESERVOIR_SZ_ALIGN)
 }

illumos-utils/src/vmm_reservoir.rs

@@ -1167,7 +1167,7 @@ impl WriteTransport for BlockDeviceTransport {
         // When writing to a block device, we must write a multiple of the block
         // size. We can assume the image we're given should be
         // appropriately-sized: return an error here if it is not.
-        if total_bytes % block_size != 0 {
+        if !total_bytes.is_multiple_of(block_size) {
             return Err(WriteError::WriteError {
                 component,
                 slot,

installinator/src/write.rs

@@ -39,29 +39,9 @@ use omicron_uuid_kinds::GenericUuid as _;
 use omicron_uuid_kinds::ProbeUuid;
 use omicron_uuid_kinds::SledUuid;
 use ref_cast::RefCast;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 use sled_agent_client::types::ProbeCreate;
 use uuid::Uuid;
 
-#[derive(Debug, Clone, JsonSchema, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum IpKind {
-    Snat,
-    Floating,
-    Ephemeral,
-}
-
-impl From<nexus_db_model::IpKind> for IpKind {
-    fn from(value: nexus_db_model::IpKind) -> Self {
-        match value {
-            nexus_db_model::IpKind::SNat => Self::Snat,
-            nexus_db_model::IpKind::Ephemeral => Self::Ephemeral,
-            nexus_db_model::IpKind::Floating => Self::Floating,
-        }
-    }
-}
-
 impl super::DataStore {
     /// List the probes for the given project.
     pub async fn probe_list(

nexus/db-queries/src/db/datastore/probe.rs

@@ -15,8 +15,8 @@ use crate::db::model::{
     LldpLinkConfig, Name, SwitchInterfaceConfig, SwitchLinkFec,
     SwitchLinkSpeed, SwitchPort, SwitchPortAddressConfig,
     SwitchPortBgpPeerConfig, SwitchPortConfig, SwitchPortLinkConfig,
-    SwitchPortRouteConfig, SwitchPortSettings, SwitchPortSettingsGroup,
-    SwitchPortSettingsGroups, SwitchVlanInterfaceConfig, TxEqConfig,
+    SwitchPortRouteConfig, SwitchPortSettings, SwitchPortSettingsGroups,
+    SwitchVlanInterfaceConfig, TxEqConfig,
 };
 use crate::db::pagination::paginated;
 use async_bb8_diesel::{AsyncRunQueryDsl, Connection};
@@ -149,12 +149,6 @@ impl Into<external::SwitchPortSettings> for SwitchPortSettingsCombinedResult {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct SwitchPortSettingsGroupCreateResult {
-    pub group: SwitchPortSettingsGroup,
-    pub settings: SwitchPortSettingsCombinedResult,
-}
-
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct LinkConfigCombinedResult {
     pub port_settings_id: Uuid,

nexus/db-queries/src/db/datastore/switch_port.rs

@@ -438,7 +438,7 @@ impl DataStore {
                 }
                 Err(e) => return Err(e),
                 Ok(None) => {
-                    crate::probes::vni__search__range__empty!(|| (&id));
+                    crate::probes::vni__search__range__empty!(|| &id);
                     debug!(
                         opctx.log,
                         "No VNIs available within current search range, retrying";

nexus/db-queries/src/db/datastore/vpc.rs

@@ -19,7 +19,6 @@ use nexus_types::deployment::PendingMgsUpdate;
 use nexus_types::deployment::PendingMgsUpdateDetails;
 use nexus_types::inventory::SpType;
 use omicron_common::disk::M2Slot;
-use slog::error;
 use std::net::SocketAddrV6;
 use std::time::Duration;
 use thiserror::Error;