Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 2 additions & 0 deletions v-api/src/context/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,7 @@ where
self
}

#[allow(clippy::result_large_err)]
pub async fn build(self) -> Result<VContext<T>, VContextBuilderError> {
if self.storage.is_some() && self.storage_url.is_some() {
return Err(VContextBuilderError::ConfigConflict(
Expand Down Expand Up @@ -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<MockStorage>,
groups: Vec<PresetGroupConfig<VPermission>>,
Expand Down
4 changes: 2 additions & 2 deletions v-api/src/endpoints/login/oauth/flow/code.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
}
Expand Down Expand Up @@ -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
);
}
Expand Down
Loading