Merge pull request #41 from aloucks/serdename

Rename `serde1` feature to `serde`

Author: tarcieri

Cargo.toml

@@ -28,7 +28,8 @@ pem = { version = "0.7", optional = true }
 version = "1.1.0"
 features = ["alloc", "zeroize_derive"]
 
-[dependencies.serde]
+[dependencies.serde_crate]
+package = "serde"
 optional = true
 version = "1.0.89"
 default-features = false
@@ -55,5 +56,6 @@ name = "key"
 [features]
 default = ["pem"]
 nightly = ["subtle/nightly", "num-bigint/nightly"]
-serde1 = ["num-bigint/serde", "serde"]
+serde = ["num-bigint/serde", "serde_crate"]
+serde1 = ["serde"] # deprecated
 expose-internals = []

src/key.rs

@@ -3,8 +3,8 @@ use num_bigint::Sign::Plus;
 use num_bigint::{BigInt, BigUint};
 use num_traits::{FromPrimitive, One};
 use rand::{rngs::ThreadRng, Rng};
-#[cfg(feature = "serde1")]
-use serde::{Deserialize, Serialize};
+#[cfg(feature = "serde")]
+use serde_crate::{Deserialize, Serialize};
 use zeroize::Zeroize;
 
 use crate::algorithms::generate_multi_prime_key;
@@ -20,15 +20,15 @@ lazy_static! {
 
 /// Represents the public part of an RSA key.
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct RSAPublicKey {
     n: BigUint,
     e: BigUint,
 }
 
 /// Represents a whole RSA key, public and private parts.
 #[derive(Debug, Clone)]
-#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct RSAPrivateKey {
     /// Modulus
     n: BigUint,
@@ -39,7 +39,7 @@ pub struct RSAPrivateKey {
     /// Prime factors of N, contains >= 2 elements.
     primes: Vec<BigUint>,
     /// precomputed values to speed up private operations
-    #[cfg_attr(feature = "serde1", serde(skip))]
+    #[cfg_attr(feature = "serde", serde(skip))]
     pub(crate) precomputed: Option<PrecomputedValues>,
 }
 

src/lib.rs

@@ -34,14 +34,14 @@ extern crate rand;
 extern crate subtle;
 extern crate zeroize;
 
-#[cfg(feature = "serde1")]
-extern crate serde;
+#[cfg(feature = "serde")]
+extern crate serde_crate;
 
 #[cfg(test)]
 extern crate base64;
 #[cfg(test)]
 extern crate hex;
-#[cfg(all(test, feature = "serde1"))]
+#[cfg(all(test, feature = "serde"))]
 extern crate serde_test;
 
 pub use num_bigint::BigUint;