update to Rust 1.89 (#8844)

sunshowers · web-flow · commit 0fac1816c1a6 · 2025-08-14T22:55:35.000Z
Update Dropshot to 0.16.3 to address a new lint warning (thanks @ahl for getting it out!), plus some other dependency updates that Dropshot pulled in.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -374,7 +374,7 @@ bootstrap-agent-client = { path = "clients/bootstrap-agent-client" }
 buf-list = { version = "1.0.3", features = ["tokio1"] }
 byteorder = "1.5.0"
 bytes = "1.10.1"
-camino = { version = "1.1", features = ["serde1"] }
+camino = { version = "1.1.11", features = ["serde1"] }
 camino-tempfile = "1.4.1"
 camino-tempfile-ext = { version = "0.3.2", features = ["assert-color"] }
 cancel-safe-futures = "0.1.5"
@@ -429,7 +429,7 @@ dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
 dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "6e666520620e26432333d9060bc7d249ba9fa92e" }
-dropshot = { version = "0.16.2", features = [ "usdt-probes" ] }
+dropshot = { version = "0.16.3", features = [ "usdt-probes" ] }
 dyn-clone = "1.0.19"
 either = "1.15.0"
 ereport-types = { path = "ereport/types" }
@@ -672,7 +672,7 @@ semver = { version = "1.0.26", features = ["std", "serde"] }
 serde = { version = "1.0", default-features = false, features = [ "derive", "rc" ] }
 serde_cbor = "0.11.2"
 serde_human_bytes = { git = "https://github.com/oxidecomputer/serde_human_bytes", branch = "main" }
-serde_json = "1.0.141"
+serde_json = "1.0.142"
 serde_tokenstream = "0.2"
 serde_urlencoded = "0.7.1"
 serde_with = { version = "3.14.0", default-features = false, features = ["alloc", "macros"] }
diff --git a/common/src/api/external/http_pagination.rs b/common/src/api/external/http_pagination.rs
@@ -200,7 +200,7 @@ where
 fn data_page_params_with_limit<S>(
     limit: NonZeroU32,
     pag_params: &PaginationParams<S, PageSelector<S, S::MarkerValue>>,
-) -> Result<DataPageParams<S::MarkerValue>, HttpError>
+) -> Result<DataPageParams<'_, S::MarkerValue>, HttpError>
 where
     S: ScanParams,
 {
diff --git a/dev-tools/openapi-manager/src/resolved.rs b/dev-tools/openapi-manager/src/resolved.rs
@@ -560,11 +560,11 @@ impl<'a> Resolved<'a> {
         &self,
         ident: &ApiIdent,
         version: &semver::Version,
-    ) -> Option<&Resolution> {
+    ) -> Option<&Resolution<'_>> {
         self.api_results.get(ident).and_then(|v| v.by_version.get(version))
     }
 
-    pub fn symlink_problem(&self, ident: &ApiIdent) -> Option<&Problem> {
+    pub fn symlink_problem(&self, ident: &ApiIdent) -> Option<&Problem<'_>> {
         self.api_results.get(ident).and_then(|v| v.symlink.as_ref())
     }
 
diff --git a/nexus-sled-agent-shared/src/inventory.rs b/nexus-sled-agent-shared/src/inventory.rs
@@ -558,7 +558,7 @@ impl ZoneManifestBootInventory {
     }
 
     /// Returns a displayer for this inventory.
-    pub fn display(&self) -> ZoneManifestBootInventoryDisplay {
+    pub fn display(&self) -> ZoneManifestBootInventoryDisplay<'_> {
         ZoneManifestBootInventoryDisplay { inner: self }
     }
 }
diff --git a/nexus/db-model/src/l4_port_range.rs b/nexus/db-model/src/l4_port_range.rs
@@ -24,7 +24,7 @@ NewtypeDeref! { () pub struct L4PortRange(external::L4PortRange); }
 impl DatabaseString for L4PortRange {
     type Error = <external::L4PortRange as FromStr>::Err;
 
-    fn to_database_string(&self) -> Cow<str> {
+    fn to_database_string(&self) -> Cow<'_, str> {
         self.0.to_string().into()
     }
 
diff --git a/nexus/db-model/src/lib.rs b/nexus/db-model/src/lib.rs
@@ -432,7 +432,7 @@ pub(crate) use impl_from_sql_text;
 pub trait DatabaseString: Sized {
     type Error: std::fmt::Display;
 
-    fn to_database_string(&self) -> Cow<str>;
+    fn to_database_string(&self) -> Cow<'_, str>;
     fn from_database_string(s: &str) -> Result<Self, Self::Error>;
 }
 
@@ -445,7 +445,7 @@ use std::borrow::Cow;
 impl DatabaseString for FleetRole {
     type Error = anyhow::Error;
 
-    fn to_database_string(&self) -> Cow<str> {
+    fn to_database_string(&self) -> Cow<'_, str> {
         match self {
             FleetRole::Admin => "admin",
             FleetRole::Collaborator => "collaborator",
@@ -470,7 +470,7 @@ impl DatabaseString for FleetRole {
 impl DatabaseString for SiloRole {
     type Error = anyhow::Error;
 
-    fn to_database_string(&self) -> Cow<str> {
+    fn to_database_string(&self) -> Cow<'_, str> {
         match self {
             SiloRole::Admin => "admin",
             SiloRole::Collaborator => "collaborator",
@@ -495,7 +495,7 @@ impl DatabaseString for SiloRole {
 impl DatabaseString for ProjectRole {
     type Error = anyhow::Error;
 
-    fn to_database_string(&self) -> Cow<str> {
+    fn to_database_string(&self) -> Cow<'_, str> {
         match self {
             ProjectRole::Admin => "admin",
             ProjectRole::Collaborator => "collaborator",
diff --git a/nexus/db-model/src/role_assignment.rs b/nexus/db-model/src/role_assignment.rs
@@ -129,7 +129,7 @@ mod tests {
     impl crate::DatabaseString for DummyRoles {
         type Error = anyhow::Error;
 
-        fn to_database_string(&self) -> Cow<str> {
+        fn to_database_string(&self) -> Cow<'_, str> {
             unimplemented!()
         }
 
diff --git a/nexus/db-model/src/vpc_firewall_rule.rs b/nexus/db-model/src/vpc_firewall_rule.rs
@@ -70,7 +70,7 @@ NewtypeDeref! { () pub struct VpcFirewallRuleProtocol(external::VpcFirewallRuleP
 impl DatabaseString for VpcFirewallRuleProtocol {
     type Error = <external::VpcFirewallRuleProtocol as FromStr>::Err;
 
-    fn to_database_string(&self) -> Cow<str> {
+    fn to_database_string(&self) -> Cow<'_, str> {
         self.0.to_string().into()
     }
 
@@ -93,7 +93,7 @@ NewtypeDeref! { () pub struct VpcFirewallRuleTarget(external::VpcFirewallRuleTar
 impl DatabaseString for VpcFirewallRuleTarget {
     type Error = <external::VpcFirewallRuleTarget as FromStr>::Err;
 
-    fn to_database_string(&self) -> Cow<str> {
+    fn to_database_string(&self) -> Cow<'_, str> {
         self.0.to_string().into()
     }
 
@@ -116,7 +116,7 @@ NewtypeDeref! { () pub struct VpcFirewallRuleHostFilter(external::VpcFirewallRul
 impl DatabaseString for VpcFirewallRuleHostFilter {
     type Error = <external::VpcFirewallRuleHostFilter as FromStr>::Err;
 
-    fn to_database_string(&self) -> Cow<str> {
+    fn to_database_string(&self) -> Cow<'_, str> {
         self.0.to_string().into()
     }
 
diff --git a/nexus/db-model/src/vpc_route.rs b/nexus/db-model/src/vpc_route.rs
@@ -35,7 +35,7 @@ pub struct RouteTarget(pub external::RouteTarget);
 impl DatabaseString for RouteTarget {
     type Error = <external::RouteTarget as FromStr>::Err;
 
-    fn to_database_string(&self) -> Cow<str> {
+    fn to_database_string(&self) -> Cow<'_, str> {
         self.0.to_string().into()
     }
 
@@ -63,7 +63,7 @@ impl RouteDestination {
 impl DatabaseString for RouteDestination {
     type Error = <external::RouteDestination as FromStr>::Err;
 
-    fn to_database_string(&self) -> Cow<str> {
+    fn to_database_string(&self) -> Cow<'_, str> {
         self.0.to_string().into()
     }
 
diff --git a/nexus/db-queries/src/db/datastore/inventory.rs b/nexus/db-queries/src/db/datastore/inventory.rs
@@ -4371,13 +4371,13 @@ pub trait DataStoreInventoryTest: Send + Sync {
     /// This does not paginate.
     fn inventory_collections(
         &self,
-    ) -> BoxFuture<anyhow::Result<Vec<InvCollection>>>;
+    ) -> BoxFuture<'_, anyhow::Result<Vec<InvCollection>>>;
 }
 
 impl DataStoreInventoryTest for DataStore {
     fn inventory_collections(
         &self,
-    ) -> BoxFuture<anyhow::Result<Vec<InvCollection>>> {
+    ) -> BoxFuture<'_, anyhow::Result<Vec<InvCollection>>> {
         async {
             let conn = self
                 .pool_connection_for_tests()
diff --git a/nexus/db-queries/src/db/datastore/rendezvous_debug_dataset.rs b/nexus/db-queries/src/db/datastore/rendezvous_debug_dataset.rs
@@ -248,7 +248,7 @@ mod tests {
             .expect("inserted dataset");
         assert_eq!(
             datastore.debug_dataset_list_all_batched(opctx).await.unwrap(),
-            [dataset.clone()],
+            std::slice::from_ref(&dataset),
         );
 
         // Tombstoning it should now succeed, and we should see the tombstoned
diff --git a/nexus/src/app/mod.rs b/nexus/src/app/mod.rs
@@ -1052,7 +1052,7 @@ impl Nexus {
 
     pub(crate) fn demo_sagas(
         &self,
-    ) -> Result<std::sync::MutexGuard<CompletingDemoSagas>, Error> {
+    ) -> Result<std::sync::MutexGuard<'_, CompletingDemoSagas>, Error> {
         self.demo_sagas.lock().map_err(|error| {
             Error::internal_error(&format!(
                 "failed to acquire demo_sagas lock: {:#}",
diff --git a/nexus/test-utils/src/resource_helpers.rs b/nexus/test-utils/src/resource_helpers.rs
@@ -1523,7 +1523,7 @@ impl<'a, N: NexusServer> DiskTest<'a, N> {
             .expect("Cannot find sled")
     }
 
-    pub fn zpools(&self) -> ZpoolIterator {
+    pub fn zpools(&self) -> ZpoolIterator<'_> {
         ZpoolIterator {
             sleds: &self.sleds,
             sled: self.sleds.keys().next().copied(),
diff --git a/nexus/tests/integration_tests/silos.rs b/nexus/tests/integration_tests/silos.rs
@@ -2004,7 +2004,7 @@ async fn test_local_silo_users(cptestctx: &ControlPlaneTestContext) {
         client,
         &silo1,
         &AuthnMode::SiloUser(admin_user.id),
-        &[admin_user.clone()],
+        std::slice::from_ref(&admin_user),
     )
     .await;
 }
diff --git a/nexus/tests/integration_tests/updates.rs b/nexus/tests/integration_tests/updates.rs
@@ -591,7 +591,7 @@ async fn test_trust_root_operations(cptestctx: &ControlPlaneTestContext) {
         .expect("trust root list failed")
         .parsed_body()
         .expect("failed to parse list response");
-    assert_eq!(response.items, &[trust_root_view.clone()]);
+    assert_eq!(response.items, std::slice::from_ref(&trust_root_view.clone()));
 
     // GET /v1/system/update/trust-roots/{id}
     let id_url = format!("{TRUST_ROOTS_URL}/{}", trust_root_view.id);
diff --git a/oximeter/db/src/client/mod.rs b/oximeter/db/src/client/mod.rs
@@ -1907,6 +1907,7 @@ mod tests {
 
     mod type_mismatch {
         #[derive(oximeter::Target)]
+        #[expect(dead_code)]
         pub struct TestTarget {
             pub name1: uuid::Uuid,
             pub name2: String,
@@ -1983,7 +1984,7 @@ mod tests {
         client.schema.lock().await.clear();
 
         // Insert the new sample
-        client.insert_samples(&[sample.clone()]).await.unwrap();
+        client.insert_samples(std::slice::from_ref(&sample)).await.unwrap();
 
         // The internal map should now contain both the new timeseries schema
         let actual_schema = TimeseriesSchema::from(&sample);
@@ -3549,7 +3550,7 @@ mod tests {
         // the database data hasn't been dropped.
         assert_eq!(0, get_schema_count(&client, None).await);
         let sample = oximeter_test_utils::make_sample();
-        client.insert_samples(&[sample.clone()]).await.unwrap();
+        client.insert_samples(std::slice::from_ref(&sample)).await.unwrap();
         assert_eq!(1, get_schema_count(&client, None).await);
 
         // Re-initialize the database, see that our data still exists
diff --git a/oximeter/db/src/oxql/query/mod.rs b/oximeter/db/src/oxql/query/mod.rs
@@ -480,7 +480,8 @@ mod tests {
             }),
         };
         assert_eq!(
-            restrict_filter_idents(&filter, &[ident.clone()]).unwrap(),
+            restrict_filter_idents(&filter, std::slice::from_ref(&ident))
+                .unwrap(),
             filter
         );
         assert_eq!(restrict_filter_idents(&filter, &[]), None);
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -2,5 +2,5 @@
 # We choose a specific toolchain (rather than "stable") for repeatability.  The
 # intent is to keep this up-to-date with recently-released stable Rust.
 
-channel = "1.88.0"
+channel = "1.89.0"
 profile = "default"
diff --git a/sled-agent/config-reconciler/src/dataset_serialization_task.rs b/sled-agent/config-reconciler/src/dataset_serialization_task.rs
@@ -1040,7 +1040,7 @@ impl DatasetTask {
         let root_path = dataset.full_name();
         let get_properties_result = zfs
             .get_dataset_properties(
-                &[root_path.clone()],
+                std::slice::from_ref(&root_path),
                 WhichDatasets::SelfAndChildren,
             )
             .await;
diff --git a/sled-agent/src/sim/storage.rs b/sled-agent/src/sim/storage.rs
@@ -1291,7 +1291,7 @@ impl Storage {
         }
     }
 
-    pub fn lock(&self) -> std::sync::MutexGuard<StorageInner> {
+    pub fn lock(&self) -> std::sync::MutexGuard<'_, StorageInner> {
         self.inner.lock().unwrap()
     }
 
diff --git a/sled-agent/src/support_bundle/storage.rs b/sled-agent/src/support_bundle/storage.rs
diff --git a/sled-diagnostics/src/logs.rs b/sled-diagnostics/src/logs.rs
diff --git a/test-utils/src/dev/clickhouse.rs b/test-utils/src/dev/clickhouse.rs
diff --git a/trust-quorum/src/crypto.rs b/trust-quorum/src/crypto.rs
diff --git a/typed-rng/src/lib.rs b/typed-rng/src/lib.rs
diff --git a/wicket/src/state/update.rs b/wicket/src/state/update.rs
diff --git a/wicket/src/ui/panes/overview.rs b/wicket/src/ui/panes/overview.rs
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ where`
`200`	`200`	`fn data_page_params_with_limit<S>(`
`201`	`201`	`limit: NonZeroU32,`
`202`	`202`	`pag_params: &PaginationParams<S, PageSelector<S, S::MarkerValue>>,`
`203`		`-) -> Result<DataPageParams<S::MarkerValue>, HttpError>`
	`203`	`+) -> Result<DataPageParams<'_, S::MarkerValue>, HttpError>`
`204`	`204`	`where`
`205`	`205`	`S: ScanParams,`
`206`	`206`	`{`
Original file line number	Diff line number	Diff line change
`@@ -560,11 +560,11 @@ impl<'a> Resolved<'a> {`
`560`	`560`	`&self,`
`561`	`561`	`ident: &ApiIdent,`
`562`	`562`	`version: &semver::Version,`
`563`		`- ) -> Option<&Resolution> {`
	`563`	`+ ) -> Option<&Resolution<'_>> {`
`564`	`564`	`self.api_results.get(ident).and_then(\|v\| v.by_version.get(version))`
`565`	`565`	`}`
`566`	`566`
`567`		`- pub fn symlink_problem(&self, ident: &ApiIdent) -> Option<&Problem> {`
	`567`	`+ pub fn symlink_problem(&self, ident: &ApiIdent) -> Option<&Problem<'_>> {`
`568`	`568`	`self.api_results.get(ident).and_then(\|v\| v.symlink.as_ref())`
`569`	`569`	`}`
`570`	`570`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ impl ZoneManifestBootInventory {`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`/// Returns a displayer for this inventory.`
`561`		`- pub fn display(&self) -> ZoneManifestBootInventoryDisplay {`
	`561`	`+ pub fn display(&self) -> ZoneManifestBootInventoryDisplay<'_> {`
`562`	`562`	`ZoneManifestBootInventoryDisplay { inner: self }`
`563`	`563`	`}`
`564`	`564`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ NewtypeDeref! { () pub struct L4PortRange(external::L4PortRange); }`
`24`	`24`	`impl DatabaseString for L4PortRange {`
`25`	`25`	`type Error = <external::L4PortRange as FromStr>::Err;`
`26`	`26`
`27`		`- fn to_database_string(&self) -> Cow<str> {`
	`27`	`+ fn to_database_string(&self) -> Cow<'_, str> {`
`28`	`28`	`self.0.to_string().into()`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ mod tests {`
`129`	`129`	`impl crate::DatabaseString for DummyRoles {`
`130`	`130`	`type Error = anyhow::Error;`
`131`	`131`
`132`		`- fn to_database_string(&self) -> Cow<str> {`
	`132`	`+ fn to_database_string(&self) -> Cow<'_, str> {`
`133`	`133`	`unimplemented!()`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ NewtypeDeref! { () pub struct VpcFirewallRuleProtocol(external::VpcFirewallRuleP`
`70`	`70`	`impl DatabaseString for VpcFirewallRuleProtocol {`
`71`	`71`	`type Error = <external::VpcFirewallRuleProtocol as FromStr>::Err;`
`72`	`72`
`73`		`- fn to_database_string(&self) -> Cow<str> {`
	`73`	`+ fn to_database_string(&self) -> Cow<'_, str> {`
`74`	`74`	`self.0.to_string().into()`
`75`	`75`	`}`
`76`	`76`
`@@ -93,7 +93,7 @@ NewtypeDeref! { () pub struct VpcFirewallRuleTarget(external::VpcFirewallRuleTar`
`93`	`93`	`impl DatabaseString for VpcFirewallRuleTarget {`
`94`	`94`	`type Error = <external::VpcFirewallRuleTarget as FromStr>::Err;`
`95`	`95`
`96`		`- fn to_database_string(&self) -> Cow<str> {`
	`96`	`+ fn to_database_string(&self) -> Cow<'_, str> {`
`97`	`97`	`self.0.to_string().into()`
`98`	`98`	`}`
`99`	`99`
`@@ -116,7 +116,7 @@ NewtypeDeref! { () pub struct VpcFirewallRuleHostFilter(external::VpcFirewallRul`
`116`	`116`	`impl DatabaseString for VpcFirewallRuleHostFilter {`
`117`	`117`	`type Error = <external::VpcFirewallRuleHostFilter as FromStr>::Err;`
`118`	`118`
`119`		`- fn to_database_string(&self) -> Cow<str> {`
	`119`	`+ fn to_database_string(&self) -> Cow<'_, str> {`
`120`	`120`	`self.0.to_string().into()`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ pub struct RouteTarget(pub external::RouteTarget);`
`35`	`35`	`impl DatabaseString for RouteTarget {`
`36`	`36`	`type Error = <external::RouteTarget as FromStr>::Err;`
`37`	`37`
`38`		`- fn to_database_string(&self) -> Cow<str> {`
	`38`	`+ fn to_database_string(&self) -> Cow<'_, str> {`
`39`	`39`	`self.0.to_string().into()`
`40`	`40`	`}`
`41`	`41`
`@@ -63,7 +63,7 @@ impl RouteDestination {`
`63`	`63`	`impl DatabaseString for RouteDestination {`
`64`	`64`	`type Error = <external::RouteDestination as FromStr>::Err;`
`65`	`65`
`66`		`- fn to_database_string(&self) -> Cow<str> {`
	`66`	`+ fn to_database_string(&self) -> Cow<'_, str> {`
`67`	`67`	`self.0.to_string().into()`
`68`	`68`	`}`
`69`	`69`