Skip to content

Commit

Permalink
chore: bump keyring to 3.x to bump syn to 2.x (#823)
Browse files Browse the repository at this point in the history
  • Loading branch information
baszalmstra authored Aug 16, 2024
1 parent b17d3e3 commit f6a7269
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:
RUST_BACKTRACE: 1
RUSTFLAGS: "-D warnings"
CARGO_TERM_COLOR: always
DEFAULT_FEATURES: tokio,serde,reqwest,sparse,sysinfo,resolvo,gateway
DEFAULT_FEATURES: indicatif,tokio,serde,wasm,reqwest,sparse,gateway,resolvo,libsolv_c

jobs:
check-rustdoc-links:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ indicatif = "0.17.8"
insta = { version = "1.38.0" }
itertools = "0.13.0"
json-patch = "2.0.0"
keyring = "2.3.2"
keyring = "3.1.0"
lazy-regex = "3.1.0"
lazy_static = "1.4.0"
libc = { version = "0.2" }
Expand Down
2 changes: 1 addition & 1 deletion crates/rattler_networking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fslock = { workspace = true }
google-cloud-auth = { workspace = true, optional = true }
http = { workspace = true }
itertools = { workspace = true }
keyring = { workspace = true }
keyring = { workspace = true, features = ["apple-native", "windows-native", "async-secret-service", "async-io", "crypto-rust"] }
netrc-rs = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
reqwest-middleware = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions crates/rattler_networking/src/authentication_middleware.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ mod tests {

// Make sure the keyring is empty
if let Ok(entry) = keyring::Entry::new("rattler_test", host) {
let _ = entry.delete_password();
let _ = entry.delete_credential();
}

let retrieved = storage.get(host);
Expand Down Expand Up @@ -253,7 +253,7 @@ mod tests {

// Make sure the keyring is empty
if let Ok(entry) = keyring::Entry::new("rattler_test", host) {
let _ = entry.delete_password();
let _ = entry.delete_credential();
}

let retrieved = storage.get(host);
Expand Down Expand Up @@ -313,7 +313,7 @@ mod tests {

// Make sure the keyring is empty
if let Ok(entry) = keyring::Entry::new("rattler_test", host) {
let _ = entry.delete_password();
let _ = entry.delete_credential();
}

let retrieved = storage.get(host);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl StorageBackend for KeyringAuthenticationStorage {

fn delete(&self, host: &str) -> Result<()> {
let entry = Entry::new(&self.store_key, host)?;
entry.delete_password()?;
entry.delete_credential()?;

Ok(())
}
Expand Down

0 comments on commit f6a7269

Please sign in to comment.