Skip to content

Update dependency rust to v1.97.1 #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

Merged
notpeter merged 2 commits into from
Aug 3, 2026
Merged

Update dependency rust to v1.97.1 #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e873dc
Update dependency rust to v1.97.1
oxide-renovate[bot] Jul 17, 2026
6519b94
Cargo clippy; cargo fmt
notpeter Aug 3, 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.97.1"
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
2 changes: 1 addition & 1 deletion v-model/tests/postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ impl TestDb {
// Connect to the builtin postgres database since we know it exists.
// This makes it easier to deal with postgres instances stood up as
// part of a dev environment manager such as flox.dev
let url = format!("{}/postgres", &self.db_base);
let url = format!("{}/postgres", self.db_base);
let conn: ConnectionManager<PgConnection> = ConnectionManager::new(&url);
conn.connect().unwrap()
}
Expand Down
Loading