From 00ee5f3575ce6bef74952404a007a308d5186240 Mon Sep 17 00:00:00 2001
From: iliana etaoin <iliana@oxide.computer>
Date: Fri, 4 Sep 2026 14:14:00 -0700
Subject: [PATCH] update rust toolchain to 1.98.1

---
 nexus/db-queries/src/db/collection_attach.rs  | 2 +-
 nexus/tests/integration_tests/external_ips.rs | 2 +-
 nexus/tests/integration_tests/instances.rs    | 2 +-
 oximeter/db/src/sql/mod.rs                    | 2 +-
 rust-toolchain.toml                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nexus/db-queries/src/db/collection_attach.rs b/nexus/db-queries/src/db/collection_attach.rs
index 03089167328..b9f00adcec9 100644
--- a/nexus/db-queries/src/db/collection_attach.rs
+++ b/nexus/db-queries/src/db/collection_attach.rs
@@ -18,7 +18,7 @@ use super::cte_utils::{
 };
 use async_bb8_diesel::AsyncRunQueryDsl;
 use diesel::associations::HasTable;
-use diesel::expression::{AsExpression, Expression};
+use diesel::expression::{AsExpression, Expression, IntoSql};
 use diesel::helper_types::*;
 use diesel::pg::Pg;
 use diesel::prelude::*;
diff --git a/nexus/tests/integration_tests/external_ips.rs b/nexus/tests/integration_tests/external_ips.rs
index d2758574e59..842b8f68677 100644
--- a/nexus/tests/integration_tests/external_ips.rs
+++ b/nexus/tests/integration_tests/external_ips.rs
@@ -778,7 +778,7 @@ async fn test_floating_ip_create_attachment(
     .await;
     assert_eq!(
         error.message,
-        format!("Floating IP cannot be deleted while attached to an instance"),
+        "Floating IP cannot be deleted while attached to an instance",
     );
 
     // Stop and delete the instance.
diff --git a/nexus/tests/integration_tests/instances.rs b/nexus/tests/integration_tests/instances.rs
index b0b11b3f908..27bca3e1543 100644
--- a/nexus/tests/integration_tests/instances.rs
+++ b/nexus/tests/integration_tests/instances.rs
@@ -6722,7 +6722,7 @@ async fn test_boot_disk_must_be_attached(cptestctx: &ControlPlaneTestContext) {
     )
     .await;
 
-    assert_eq!(error.message, format!("boot disk must be attached"));
+    assert_eq!(error.message, "boot disk must be attached");
 
     // Now attach the disk.
     let url_instance_detach_disk =
diff --git a/oximeter/db/src/sql/mod.rs b/oximeter/db/src/sql/mod.rs
index 76404bf0d76..bffd762a15c 100644
--- a/oximeter/db/src/sql/mod.rs
+++ b/oximeter/db/src/sql/mod.rs
@@ -980,7 +980,7 @@ impl RestrictedQuery {
                 "Query must select from a single named table, with no database"
             );
         }
-        if let Some(from) = select.from.iter_mut().next() {
+        if let Some(from) = select.from.first_mut() {
             timeseries.extend(Self::process_table_factor(&mut from.relation)?);
             for join in from.joins.iter_mut() {
                 let op = match &join.join_operator {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index b50f198a59e..74dd977ecc6 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
 # 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.97.1"
+channel = "1.98.1"
 profile = "default"