Skip to content

Commit 2ce7dc5

Browse files
Merge pull request #122 from brotskydotcom/fix-secret-service-docs
Fix misleading typo in secret-service docs. The same typo was in the Mac, iOS, and xplat docs, but it wasn't serious there because it didn't affect attribute names. Fixes #121.
2 parents ced3b6b + aae3e31 commit 2ce7dc5

6 files changed

+19
-8
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ keywords = ["password", "credential", "keychain", "keyring", "cross-platform"]
66
license = "MIT OR Apache-2.0"
77
name = "keyring"
88
repository = "https://github.com/hwchen/keyring-rs.git"
9-
version = "2.0.1"
9+
version = "2.0.2"
1010
edition = "2021"
1111
exclude = [".github/"]
1212
readme = "README.md"

build-xplat-binaries.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
rustup update
3+
cargo update
4+
cargo clippy --target x86_64-unknown-linux-musl
5+
cargo clippy --target x86_64-pc-windows-gnu
6+
cargo clippy --target aarch64-apple-darwin
7+
cargo clippy --target aarch64-apple-ios
8+
cargo build --target x86_64-unknown-linux-musl
9+
cargo build --target x86_64-pc-windows-gnu
10+
cargo build --target aarch64-apple-darwin
11+
cargo build --target aarch64-apple-ios

src/ios.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ iOS credential stores are called Keychains. On iOS there is only one of these.
66
Generic credentials on iOS can be identified by a large number of _key/value_ attributes;
77
this module (currently) uses only the _account_ and _name_ attributes.
88
9-
For a given service/username pair,
9+
For a given service/user pair,
1010
this module targets a generic credential in the User (login) keychain
11-
whose _account_ is the username and and whose _name_ is the service.
11+
whose _account_ is the user and and whose _name_ is the service.
1212
Because of a quirk in the iOS keychain services API, neither the _account_
1313
nor the _name_ may be the empty string. (Empty strings are treated as
1414
wildcards when looking up credentials by attribute value.)

src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,14 @@ pub struct Entry {
192192
}
193193

194194
impl Entry {
195-
/// Create an entry for the given service and username.
195+
/// Create an entry for the given service and user.
196196
///
197197
/// The default credential builder is used.
198198
pub fn new(service: &str, user: &str) -> Result<Entry> {
199199
build_default_credential(None, service, user)
200200
}
201201

202-
/// Create an entry for the given target, service, and username.
202+
/// Create an entry for the given target, service, and user.
203203
///
204204
/// The default credential builder is used.
205205
pub fn new_with_target(target: &str, service: &str, user: &str) -> Result<Entry> {

src/macos.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ The OS automatically creates three of them (or four if removable media is being
77
Generic credentials on macOS can be identified by a large number of _key/value_ attributes;
88
this module (currently) uses only the _account_ and _name_ attributes.
99
10-
For a given service/username pair,
10+
For a given service/user pair,
1111
this module targets a generic credential in the User (login) keychain
12-
whose _account_ is the username and and whose _name_ is the service.
12+
whose _account_ is the user and and whose _name_ is the service.
1313
Because of a quirk in the Mac keychain services API, neither the _account_
1414
nor the _name_ may be the empty string. (Empty strings are treated as
1515
wildcards when looking up credentials by attribute value.)

src/secret_service.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ implementation uses the following attributes:
88
99
- `target` (optional & taken from entry creation call, defaults to `default`)
1010
- `service` (required & taken from entry creation call)
11-
- `user` (required & taken from entry creation call)
11+
- `username` (required & taken from entry creation call)
1212
- `application` (optional & always set to `rust-keyring`)
1313
1414
Existing items are always searched for at the service level, which

0 commit comments

Comments
 (0)