Skip to content

Commit 2b1f87c

Browse files
committed
Auto merge of #12521 - arlosi:cred-libsecret, r=epage
Make cargo-credential-gnome-secret built-in as cargo:libsecret We previously couldn't have cargo-credential-gnome-secret built into Cargo because of its build-time dependency on `libsecret`. However, this limitation has now been lifted by #12518. Adds a new built-in credential provider `cargo:libsecret`. Adds `ISC` as an allowed license for `libloading`. * `rustc` already uses `libloading` * ISC license is very similar to MIT Renames the crate from `cargo-credential-gnome-secret` to `cargo-credential-libsecret` and changes the crate structure to more closely match `wincred` and `macos-keychain`.
2 parents 37a0514 + 763edba commit 2b1f87c

File tree

11 files changed

+245
-257
lines changed

11 files changed

+245
-257
lines changed

Cargo.lock

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ base64 = "0.21.2"
2020
bytesize = "1.2"
2121
cargo = { path = "" }
2222
cargo-credential = { version = "0.3.0", path = "credential/cargo-credential" }
23+
cargo-credential-libsecret = { version = "0.3.1", path = "credential/cargo-credential-libsecret" }
2324
cargo-credential-wincred = { version = "0.3.0", path = "credential/cargo-credential-wincred" }
2425
cargo-credential-macos-keychain = { version = "0.3.0", path = "credential/cargo-credential-macos-keychain" }
2526
cargo-platform = { path = "crates/cargo-platform", version = "0.1.4" }
@@ -123,6 +124,7 @@ base64.workspace = true
123124
bytesize.workspace = true
124125
cargo-platform.workspace = true
125126
cargo-credential.workspace = true
127+
cargo-credential-libsecret.workspace = true
126128
cargo-credential-macos-keychain.workspace = true
127129
cargo-credential-wincred.workspace = true
128130
cargo-util.workspace = true

crates/xtask-bump-check/src/xtask.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ fn bump_check(args: &clap::ArgMatches, config: &mut cargo::util::Config) -> Carg
153153
"--exclude",
154154
"cargo-credential-1password",
155155
"--exclude",
156-
"cargo-credential-gnome-secret",
156+
"cargo-credential-libsecret",
157157
"--exclude",
158158
"cargo-credential-macos-keychain",
159159
"--exclude",

credential/cargo-credential-gnome-secret/src/libsecret.rs

-226
This file was deleted.

credential/cargo-credential-gnome-secret/src/main.rs

-12
This file was deleted.

credential/cargo-credential-gnome-secret/Cargo.toml credential/cargo-credential-libsecret/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "cargo-credential-gnome-secret"
2+
name = "cargo-credential-libsecret"
33
version = "0.3.1"
44
edition.workspace = true
55
license.workspace = true
@@ -10,4 +10,3 @@ description = "A Cargo credential process that stores tokens with GNOME libsecre
1010
anyhow.workspace = true
1111
cargo-credential.workspace = true
1212
libloading.workspace = true
13-

credential/cargo-credential-gnome-secret/README.md credential/cargo-credential-libsecret/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# cargo-credential-gnome-secret
1+
# cargo-credential-libsecret
22

33
This is the implementation for the Cargo credential helper for [GNOME libsecret].
44
See the [credential-process] documentation for how to use this.

0 commit comments

Comments
 (0)