rename cargo features

.github/workflows/ci.yaml

@@ -56,12 +56,12 @@ jobs:
           - "async-secret-service,async-io,crypto-rust"
           - "async-secret-service,tokio,crypto-openssl"
           - "async-secret-service,async-io,crypto-openssl"
-          - "sync-persistent-keyutils,crypto-rust"
-          - "sync-persistent-keyutils,crypto-openssl"
-          - "async-persistent-keyutils,tokio,crypto-rust"
-          - "async-persistent-keyutils,async-io,crypto-rust"
-          - "async-persistent-keyutils,tokio,crypto-openssl"
-          - "async-persistent-keyutils,async-io,crypto-openssl"
+          - "linux-native-sync-persistent,crypto-rust"
+          - "linux-native-sync-persistent,crypto-openssl"
+          - "linux-native-async-persistent,tokio,crypto-rust"
+          - "linux-native-async-persistent,async-io,crypto-rust"
+          - "linux-native-async-persistent,tokio,crypto-openssl"
+          - "linux-native-async-persistent,async-io,crypto-openssl"
 
     steps:
       - name: Install CI dependencies

Cargo.toml

@@ -17,8 +17,8 @@ linux-native = ["dep:linux-keyutils"]
 apple-native = ["dep:security-framework"]
 windows-native = ["dep:windows-sys", "dep:byteorder"]
 
-sync-persistent-keyutils = ["dep:linux-keyutils", "sync-secret-service"]
-async-persistent-keyutils = ["dep:linux-keyutils", "async-secret-service"]
+linux-native-sync-persistent = ["linux-native", "sync-secret-service"]
+linux-native-async-persistent = ["linux-native", "async-secret-service"]
 sync-secret-service = ["dep:dbus-secret-service"]
 async-secret-service = ["dep:secret-service", "dep:zbus"]
 crypto-rust = ["dbus-secret-service?/crypto-rust", "secret-service?/crypto-rust"]

src/lib.rs

@@ -187,23 +187,16 @@ pub mod mock;
 #[cfg(any(
     all(feature = "sync-secret-service", feature = "async-secret-service"),
     all(
-        feature = "sync-persistent-keyutils",
-        feature = "async-persistent-keyutils",
+        feature = "linux-native-sync-persistent",
+        feature = "linux-native-async-persistent",
     )
 ))]
 compile_error!("This crate cannot use both the sync and async versions of any credential store");
 
 //
 // pick the *nix keystore
 //
-#[cfg(all(
-    target_os = "linux",
-    any(
-        feature = "linux-native",
-        feature = "sync-persistent-keyutils",
-        feature = "async-persistent-keyutils",
-    )
-))]
+#[cfg(all(target_os = "linux", feature = "linux-native"))]
 pub mod keyutils;
 #[cfg(all(
     target_os = "linux",
@@ -222,25 +215,25 @@ pub mod secret_service;
     any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"),
     any(feature = "sync-secret-service", feature = "async-secret-service"),
     not(any(
-        feature = "sync-persistent-keyutils",
-        feature = "async-persistent-keyutils",
+        feature = "linux-native-sync-persistent",
+        feature = "linux-native-async-persistent",
     )),
 ))]
 pub use secret_service as default;
 
 #[cfg(all(
     target_os = "linux",
     any(
-        feature = "sync-persistent-keyutils",
-        feature = "async-persistent-keyutils",
+        feature = "linux-native-sync-persistent",
+        feature = "linux-native-async-persistent",
     )
 ))]
 pub mod keyutils_persistent;
 #[cfg(all(
     target_os = "linux",
     any(
-        feature = "sync-persistent-keyutils",
-        feature = "async-persistent-keyutils",
+        feature = "linux-native-sync-persistent",
+        feature = "linux-native-async-persistent",
     ),
 ))]
 pub use keyutils_persistent as default;