cargo: rename secret feature to secrecy-08

Author: muzarski

.github/workflows/rust.yml

@@ -44,8 +44,8 @@ jobs:
       run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "full-serialization"
     - name: Cargo check with all features
       run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --all-features
-    - name: Cargo check with secret feature
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "secret"
+    - name: Cargo check with secrecy-08 feature
+      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "secrecy-08"
     - name: Cargo check with chrono feature
       run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "chrono"
     - name: Cargo check with time feature

scylla-cql/Cargo.toml

@@ -15,7 +15,7 @@ byteorder = "1.3.4"
 bytes = "1.0.1"
 # FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
 tokio = { version = ">=1.34, <1.38", features = ["io-util", "time"] }
-secrecy = { version = "0.8", optional = true }
+secrecy-08 = { package = "secrecy", version = "0.8", optional = true }
 snap = "1.0"
 uuid = "1.0"
 thiserror = "1.0"
@@ -40,7 +40,7 @@ name = "benchmark"
 harness = false
 
 [features]
-secret = ["secrecy"]
+secrecy-08 = ["dep:secrecy-08"]
 time = ["dep:time"]
 chrono = ["dep:chrono"]
 num-bigint-03 = ["dep:num-bigint-03"]
@@ -49,7 +49,7 @@ bigdecimal-04 = ["dep:bigdecimal-04"]
 full-serialization = [
     "chrono",
     "time",
-    "secret",
+    "secrecy-08",
     "num-bigint-03",
     "num-bigint-04",
     "bigdecimal-04",

scylla-cql/src/frame/response/cql_to_rust.rs

@@ -11,9 +11,6 @@ use uuid::Uuid;
 #[cfg(feature = "chrono")]
 use chrono::{DateTime, NaiveDate, NaiveTime, Utc};
 
-#[cfg(feature = "secret")]
-use secrecy::{Secret, Zeroize};
-
 #[derive(Error, Debug, Clone, PartialEq, Eq)]
 pub enum FromRowError {
     #[error("{err} in the column with index {column}")]
@@ -240,10 +237,10 @@ impl FromCqlVal<CqlValue> for time::OffsetDateTime {
     }
 }
 
-#[cfg(feature = "secret")]
-impl<V: FromCqlVal<CqlValue> + Zeroize> FromCqlVal<CqlValue> for Secret<V> {
+#[cfg(feature = "secrecy-08")]
+impl<V: FromCqlVal<CqlValue> + secrecy_08::Zeroize> FromCqlVal<CqlValue> for secrecy_08::Secret<V> {
     fn from_cql(cql_val: CqlValue) -> Result<Self, FromCqlValError> {
-        Ok(Secret::new(FromCqlVal::from_cql(cql_val)?))
+        Ok(secrecy_08::Secret::new(FromCqlVal::from_cql(cql_val)?))
     }
 }
 

scylla-cql/src/frame/value.rs

@@ -16,9 +16,6 @@ use super::response::result::CqlValue;
 use super::types::vint_encode;
 use super::types::RawValue;
 
-#[cfg(feature = "secret")]
-use secrecy::{ExposeSecret, Secret, Zeroize};
-
 /// Every value being sent in a query must implement this trait
 /// serialize() should write the Value as [bytes] to the provided buffer
 pub trait Value {
@@ -1076,9 +1073,10 @@ impl Value for time::Time {
     }
 }
 
-#[cfg(feature = "secret")]
-impl<V: Value + Zeroize> Value for Secret<V> {
+#[cfg(feature = "secrecy-08")]
+impl<V: Value + secrecy_08::Zeroize> Value for secrecy_08::Secret<V> {
     fn serialize(&self, buf: &mut Vec<u8>) -> Result<(), ValueTooBig> {
+        use secrecy_08::ExposeSecret;
         self.expose_secret().serialize(buf)
     }
 }

scylla-cql/src/frame/value_tests.rs

@@ -872,11 +872,10 @@ fn cqlvalue_serialization() {
     );
 }
 
-#[cfg(feature = "secret")]
+#[cfg(feature = "secrecy-08")]
 #[test]
 fn secret_serialization() {
-    use secrecy::Secret;
-    let secret = Secret::new(987654i32);
+    let secret = secrecy_08::Secret::new(987654i32);
     assert_eq!(
         serialized(secret, ColumnType::Int),
         vec![0, 0, 0, 4, 0x00, 0x0f, 0x12, 0x06]

scylla-cql/src/types/deserialize/value.rs

@@ -616,10 +616,10 @@ impl_emptiable_strict_type!(
 );
 
 // secrecy
-#[cfg(feature = "secret")]
-impl<'frame, T> DeserializeValue<'frame> for secrecy::Secret<T>
+#[cfg(feature = "secrecy-08")]
+impl<'frame, T> DeserializeValue<'frame> for secrecy_08::Secret<T>
 where
-    T: DeserializeValue<'frame> + secrecy::Zeroize,
+    T: DeserializeValue<'frame> + secrecy_08::Zeroize,
 {
     fn type_check(typ: &ColumnType) -> Result<(), TypeCheckError> {
         <T as DeserializeValue<'frame>>::type_check(typ)
@@ -629,7 +629,7 @@ where
         typ: &'frame ColumnType,
         v: Option<FrameSlice<'frame>>,
     ) -> Result<Self, DeserializationError> {
-        <T as DeserializeValue<'frame>>::deserialize(typ, v).map(secrecy::Secret::new)
+        <T as DeserializeValue<'frame>>::deserialize(typ, v).map(secrecy_08::Secret::new)
     }
 }
 

scylla-cql/src/types/serialize/value.rs

@@ -12,9 +12,6 @@ use uuid::Uuid;
 #[cfg(feature = "chrono")]
 use chrono::{DateTime, NaiveDate, NaiveTime, Utc};
 
-#[cfg(feature = "secret")]
-use secrecy::{ExposeSecret, Secret, Zeroize};
-
 use crate::frame::response::result::{ColumnType, CqlValue};
 use crate::frame::types::vint_encode;
 use crate::frame::value::{
@@ -205,13 +202,14 @@ impl SerializeValue for time::Time {
         <CqlTime as SerializeValue>::serialize(&(*me).into(), typ, writer)?
     });
 }
-#[cfg(feature = "secret")]
-impl<V: SerializeValue + Zeroize> SerializeValue for Secret<V> {
+#[cfg(feature = "secrecy-08")]
+impl<V: SerializeValue + secrecy_08::Zeroize> SerializeValue for secrecy_08::Secret<V> {
     fn serialize<'b>(
         &self,
         typ: &ColumnType,
         writer: CellWriter<'b>,
     ) -> Result<WrittenCellProof<'b>, SerializationError> {
+        use secrecy_08::ExposeSecret;
         V::serialize(self.expose_secret(), typ, writer)
     }
 }

scylla/Cargo.toml

@@ -24,7 +24,7 @@ cloud = [
     "dep:url",
     "dep:base64",
 ]
-secret = ["scylla-cql/secret"]
+secrecy-08 = ["scylla-cql/secrecy-08"]
 chrono = ["scylla-cql/chrono"]
 time = ["scylla-cql/time"]
 num-bigint-03 = ["scylla-cql/num-bigint-03"]
@@ -33,7 +33,7 @@ bigdecimal-04 = ["scylla-cql/bigdecimal-04"]
 full-serialization = [
     "chrono",
     "time",
-    "secret",
+    "secrecy-08",
     "num-bigint-03",
     "num-bigint-04",
     "bigdecimal-04",