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"] 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 ); }