Skip to content

Update dependency rust to v1.96.0 #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oxide-renovate wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update dependency rust to v1.96.0 #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
743fc60
Update dependency rust to v1.96.0
oxide-renovate[bot] May 29, 2026
70929f2
Clippy fixes
notpeter Jun 9, 2026
c1814d4
Cargo fmt
notpeter Jun 9, 2026
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
View file
Open in desktop
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.95.0"
channel = "1.96.0"
components = ["clippy", "rustfmt"]
19 changes: 10 additions & 9 deletions v-api/src/endpoints/login/oauth/remote/google.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,16 @@ impl GoogleOAuthProvider {
revocation_endpoint: Some("https://oauth2.googleapis.com/revoke".to_string()),
},
});
let authz_code_pkce_flow_info = config
.proxy_web
.and_then(|proxy| authz_code_flow_info.as_ref().map(|web| (web, proxy)))
.map(|(web, proxy)| OAuthProviderAuthorizationCodePkceInfo {
client_id: proxy.client_id,
redirect_endpoint: proxy.redirect_uri,
proxy_port: proxy.proxy_port,
web: web.clone(),
});
let authz_code_pkce_flow_info =
authz_code_flow_info
.as_ref()
.zip(config.proxy_web)
.map(|(web, proxy)| OAuthProviderAuthorizationCodePkceInfo {
client_id: proxy.client_id,
redirect_endpoint: proxy.redirect_uri,
proxy_port: proxy.proxy_port,
web: web.clone(),
});
let device_code_flow_info = config.device.map(|device| OAuthProviderDeviceInfo {
client_id: device.client_id,
auth_url_endpoint: format!("{}/login/oauth/google/device", public_url),
Expand Down
19 changes: 10 additions & 9 deletions v-api/src/endpoints/login/oauth/remote/zendesk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,16 @@ impl ZendeskOAuthProvider {
revocation_endpoint: None,
},
});
let authz_code_pkce_flow_info = config
.proxy_web
.and_then(|proxy| authz_code_flow_info.as_ref().map(|web| (web, proxy)))
.map(|(web, proxy)| OAuthProviderAuthorizationCodePkceInfo {
client_id: proxy.client_id,
redirect_endpoint: proxy.redirect_uri,
proxy_port: proxy.proxy_port,
web: web.clone(),
});
let authz_code_pkce_flow_info =
authz_code_flow_info
.as_ref()
.zip(config.proxy_web)
.map(|(web, proxy)| OAuthProviderAuthorizationCodePkceInfo {
client_id: proxy.client_id,
redirect_endpoint: proxy.redirect_uri,
proxy_port: proxy.proxy_port,
web: web.clone(),
});

Self {
authz_code_flow_info,
Expand Down
Loading