From 540562180e41eecb94c5b7a5686ae3f1171ad872 Mon Sep 17 00:00:00 2001 From: "oxide-renovate[bot]" <146848827+oxide-renovate[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2026 05:18:07 +0000 Subject: [PATCH 1/2] Update dependency rust to v1.98.1 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6a80f673..b7d74695 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -3,5 +3,5 @@ # https://github.com/oxidecomputer/dropshot/blob/main/rust-toolchain.toml [toolchain] -channel = "1.97.1" +channel = "1.98.1" components = ["clippy", "rustfmt"] From e8fe65c025581dfc600895b4b16c187ed9a88468 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Tue, 15 Sep 2026 12:03:00 -0400 Subject: [PATCH 2/2] clippy --- v-api/src/context/mod.rs | 2 ++ v-api/src/endpoints/login/oauth/flow/code.rs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/v-api/src/context/mod.rs b/v-api/src/context/mod.rs index dc6bfa5a..6481e94e 100644 --- a/v-api/src/context/mod.rs +++ b/v-api/src/context/mod.rs @@ -933,6 +933,7 @@ where self } + #[allow(clippy::result_large_err)] pub async fn build(self) -> Result, VContextBuilderError> { if self.storage.is_some() && self.storage_url.is_some() { return Err(VContextBuilderError::ConfigConflict( @@ -1807,6 +1808,7 @@ pub(crate) mod test_mocks { } // Attempt to construct a context that has been configured with preset groups + #[allow(clippy::result_large_err)] pub async fn build_ctx_with_groups( storage: Arc, groups: Vec>, diff --git a/v-api/src/endpoints/login/oauth/flow/code.rs b/v-api/src/endpoints/login/oauth/flow/code.rs index 992e93bb..3852eae3 100644 --- a/v-api/src/endpoints/login/oauth/flow/code.rs +++ b/v-api/src/endpoints/login/oauth/flow/code.rs @@ -1482,7 +1482,7 @@ mod tests { .unwrap(); assert_eq!( - format!("https://test.oxeng.dev/callback?state=ox_state&error=server_error",), + "https://test.oxeng.dev/callback?state=ox_state&error=server_error".to_string(), location ); } @@ -1553,7 +1553,7 @@ mod tests { .unwrap(); assert_eq!( - format!("https://test.oxeng.dev/callback?state=ox_state&error=access_denied",), + "https://test.oxeng.dev/callback?state=ox_state&error=access_denied".to_string(), location ); }