fix(identity): handle warnings related to feature flags

thomaseizinger · web-flow · commit d1fadc592d67 · 2023-05-01T14:10:37.000Z
Some of the feature-flags weren't set correctly and thus produced warnings for unused code. We can fix this by using absolute paths instead of imports and allow `dead_code` for the error constructor. It might be possible to write a correct `cfg` for this as well but I think it will be very verbose, hence I didn't bother. Pull-Request: #3859.
diff --git a/identity/src/error.rs b/identity/src/error.rs
@@ -166,6 +166,7 @@ pub struct OtherVariantError {
 }
 
 impl OtherVariantError {
+    #[allow(dead_code)] // This is used but the cfg is too complicated to write ..
     pub(crate) fn new(actual: KeyType) -> OtherVariantError {
         OtherVariantError { actual }
     }
diff --git a/identity/src/keypair.rs b/identity/src/keypair.rs
@@ -20,7 +20,7 @@
 
 use crate::error::OtherVariantError;
 use crate::error::{DecodingError, SigningError};
-use crate::{proto, KeyType};
+use crate::proto;
 use quick_protobuf::{BytesReader, Writer};
 use std::convert::TryFrom;
 
@@ -322,11 +322,11 @@ impl TryInto<ed25519::Keypair> for Keypair {
         match self {
             Keypair::Ed25519(inner) => Ok(inner),
             #[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]
-            Keypair::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),
+            Keypair::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),
             #[cfg(feature = "secp256k1")]
-            Keypair::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),
+            Keypair::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),
             #[cfg(feature = "ecdsa")]
-            Keypair::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),
+            Keypair::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),
         }
     }
 }
@@ -340,11 +340,11 @@ impl TryInto<ecdsa::Keypair> for Keypair {
         match self {
             Keypair::Ecdsa(inner) => Ok(inner),
             #[cfg(feature = "ed25519")]
-            Keypair::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),
+            Keypair::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),
             #[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]
-            Keypair::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),
+            Keypair::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),
             #[cfg(feature = "secp256k1")]
-            Keypair::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),
+            Keypair::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),
         }
     }
 }
@@ -358,11 +358,11 @@ impl TryInto<secp256k1::Keypair> for Keypair {
         match self {
             Keypair::Secp256k1(inner) => Ok(inner),
             #[cfg(feature = "ed25519")]
-            Keypair::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),
+            Keypair::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),
             #[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]
-            Keypair::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),
+            Keypair::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),
             #[cfg(feature = "ecdsa")]
-            Keypair::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),
+            Keypair::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),
         }
     }
 }
@@ -376,11 +376,11 @@ impl TryInto<rsa::Keypair> for Keypair {
         match self {
             Keypair::Rsa(inner) => Ok(inner),
             #[cfg(feature = "ed25519")]
-            Keypair::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),
+            Keypair::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),
             #[cfg(feature = "secp256k1")]
-            Keypair::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),
+            Keypair::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),
             #[cfg(feature = "ecdsa")]
-            Keypair::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),
+            Keypair::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),
         }
     }
 }
@@ -597,11 +597,11 @@ impl TryInto<ed25519::PublicKey> for PublicKey {
         match self {
             PublicKey::Ed25519(inner) => Ok(inner),
             #[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]
-            PublicKey::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),
+            PublicKey::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),
             #[cfg(feature = "secp256k1")]
-            PublicKey::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),
+            PublicKey::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),
             #[cfg(feature = "ecdsa")]
-            PublicKey::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),
+            PublicKey::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),
         }
     }
 }
@@ -615,11 +615,11 @@ impl TryInto<ecdsa::PublicKey> for PublicKey {
         match self {
             PublicKey::Ecdsa(inner) => Ok(inner),
             #[cfg(feature = "ed25519")]
-            PublicKey::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),
+            PublicKey::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),
             #[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]
-            PublicKey::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),
+            PublicKey::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),
             #[cfg(feature = "secp256k1")]
-            PublicKey::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),
+            PublicKey::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),
         }
     }
 }
@@ -633,11 +633,11 @@ impl TryInto<secp256k1::PublicKey> for PublicKey {
         match self {
             PublicKey::Secp256k1(inner) => Ok(inner),
             #[cfg(feature = "ed25519")]
-            PublicKey::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),
+            PublicKey::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),
             #[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]
-            PublicKey::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),
+            PublicKey::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),
             #[cfg(feature = "ecdsa")]
-            PublicKey::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),
+            PublicKey::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),
         }
     }
 }
@@ -651,11 +651,11 @@ impl TryInto<rsa::PublicKey> for PublicKey {
         match self {
             PublicKey::Rsa(inner) => Ok(inner),
             #[cfg(feature = "ed25519")]
-            PublicKey::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),
+            PublicKey::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),
             #[cfg(feature = "secp256k1")]
-            PublicKey::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),
+            PublicKey::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),
             #[cfg(feature = "ecdsa")]
-            PublicKey::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),
+            PublicKey::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,7 @@ pub struct OtherVariantError {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`impl OtherVariantError {`
	`169`	`+ #[allow(dead_code)] // This is used but the cfg is too complicated to write ..`
`169`	`170`	`pub(crate) fn new(actual: KeyType) -> OtherVariantError {`
`170`	`171`	`OtherVariantError { actual }`
`171`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`use crate::error::OtherVariantError;`
`22`	`22`	`use crate::error::{DecodingError, SigningError};`
`23`		`-use crate::{proto, KeyType};`
	`23`	`+use crate::proto;`
`24`	`24`	`use quick_protobuf::{BytesReader, Writer};`
`25`	`25`	`use std::convert::TryFrom;`
`26`	`26`
`@@ -322,11 +322,11 @@ impl TryInto<ed25519::Keypair> for Keypair {`
`322`	`322`	`match self {`
`323`	`323`	`Keypair::Ed25519(inner) => Ok(inner),`
`324`	`324`	`#[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]`
`325`		`- Keypair::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),`
	`325`	`+ Keypair::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),`
`326`	`326`	`#[cfg(feature = "secp256k1")]`
`327`		`- Keypair::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),`
	`327`	`+ Keypair::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),`
`328`	`328`	`#[cfg(feature = "ecdsa")]`
`329`		`- Keypair::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),`
	`329`	`+ Keypair::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),`
`330`	`330`	`}`
`331`	`331`	`}`
`332`	`332`	`}`
`@@ -340,11 +340,11 @@ impl TryInto<ecdsa::Keypair> for Keypair {`
`340`	`340`	`match self {`
`341`	`341`	`Keypair::Ecdsa(inner) => Ok(inner),`
`342`	`342`	`#[cfg(feature = "ed25519")]`
`343`		`- Keypair::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),`
	`343`	`+ Keypair::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),`
`344`	`344`	`#[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]`
`345`		`- Keypair::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),`
	`345`	`+ Keypair::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),`
`346`	`346`	`#[cfg(feature = "secp256k1")]`
`347`		`- Keypair::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),`
	`347`	`+ Keypair::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),`
`348`	`348`	`}`
`349`	`349`	`}`
`350`	`350`	`}`
`@@ -358,11 +358,11 @@ impl TryInto<secp256k1::Keypair> for Keypair {`
`358`	`358`	`match self {`
`359`	`359`	`Keypair::Secp256k1(inner) => Ok(inner),`
`360`	`360`	`#[cfg(feature = "ed25519")]`
`361`		`- Keypair::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),`
	`361`	`+ Keypair::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),`
`362`	`362`	`#[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]`
`363`		`- Keypair::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),`
	`363`	`+ Keypair::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),`
`364`	`364`	`#[cfg(feature = "ecdsa")]`
`365`		`- Keypair::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),`
	`365`	`+ Keypair::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),`
`366`	`366`	`}`
`367`	`367`	`}`
`368`	`368`	`}`
`@@ -376,11 +376,11 @@ impl TryInto<rsa::Keypair> for Keypair {`
`376`	`376`	`match self {`
`377`	`377`	`Keypair::Rsa(inner) => Ok(inner),`
`378`	`378`	`#[cfg(feature = "ed25519")]`
`379`		`- Keypair::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),`
	`379`	`+ Keypair::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),`
`380`	`380`	`#[cfg(feature = "secp256k1")]`
`381`		`- Keypair::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),`
	`381`	`+ Keypair::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),`
`382`	`382`	`#[cfg(feature = "ecdsa")]`
`383`		`- Keypair::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),`
	`383`	`+ Keypair::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),`
`384`	`384`	`}`
`385`	`385`	`}`
`386`	`386`	`}`
`@@ -597,11 +597,11 @@ impl TryInto<ed25519::PublicKey> for PublicKey {`
`597`	`597`	`match self {`
`598`	`598`	`PublicKey::Ed25519(inner) => Ok(inner),`
`599`	`599`	`#[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]`
`600`		`- PublicKey::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),`
	`600`	`+ PublicKey::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),`
`601`	`601`	`#[cfg(feature = "secp256k1")]`
`602`		`- PublicKey::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),`
	`602`	`+ PublicKey::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),`
`603`	`603`	`#[cfg(feature = "ecdsa")]`
`604`		`- PublicKey::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),`
	`604`	`+ PublicKey::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),`
`605`	`605`	`}`
`606`	`606`	`}`
`607`	`607`	`}`
`@@ -615,11 +615,11 @@ impl TryInto<ecdsa::PublicKey> for PublicKey {`
`615`	`615`	`match self {`
`616`	`616`	`PublicKey::Ecdsa(inner) => Ok(inner),`
`617`	`617`	`#[cfg(feature = "ed25519")]`
`618`		`- PublicKey::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),`
	`618`	`+ PublicKey::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),`
`619`	`619`	`#[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]`
`620`		`- PublicKey::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),`
	`620`	`+ PublicKey::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),`
`621`	`621`	`#[cfg(feature = "secp256k1")]`
`622`		`- PublicKey::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),`
	`622`	`+ PublicKey::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),`
`623`	`623`	`}`
`624`	`624`	`}`
`625`	`625`	`}`
`@@ -633,11 +633,11 @@ impl TryInto<secp256k1::PublicKey> for PublicKey {`
`633`	`633`	`match self {`
`634`	`634`	`PublicKey::Secp256k1(inner) => Ok(inner),`
`635`	`635`	`#[cfg(feature = "ed25519")]`
`636`		`- PublicKey::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),`
	`636`	`+ PublicKey::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),`
`637`	`637`	`#[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]`
`638`		`- PublicKey::Rsa(_) => Err(OtherVariantError::new(KeyType::RSA)),`
	`638`	`+ PublicKey::Rsa(_) => Err(OtherVariantError::new(crate::KeyType::RSA)),`
`639`	`639`	`#[cfg(feature = "ecdsa")]`
`640`		`- PublicKey::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),`
	`640`	`+ PublicKey::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),`
`641`	`641`	`}`
`642`	`642`	`}`
`643`	`643`	`}`
`@@ -651,11 +651,11 @@ impl TryInto<rsa::PublicKey> for PublicKey {`
`651`	`651`	`match self {`
`652`	`652`	`PublicKey::Rsa(inner) => Ok(inner),`
`653`	`653`	`#[cfg(feature = "ed25519")]`
`654`		`- PublicKey::Ed25519(_) => Err(OtherVariantError::new(KeyType::Ed25519)),`
	`654`	`+ PublicKey::Ed25519(_) => Err(OtherVariantError::new(crate::KeyType::Ed25519)),`
`655`	`655`	`#[cfg(feature = "secp256k1")]`
`656`		`- PublicKey::Secp256k1(_) => Err(OtherVariantError::new(KeyType::Secp256k1)),`
	`656`	`+ PublicKey::Secp256k1(_) => Err(OtherVariantError::new(crate::KeyType::Secp256k1)),`
`657`	`657`	`#[cfg(feature = "ecdsa")]`
`658`		`- PublicKey::Ecdsa(_) => Err(OtherVariantError::new(KeyType::Ecdsa)),`
	`658`	`+ PublicKey::Ecdsa(_) => Err(OtherVariantError::new(crate::KeyType::Ecdsa)),`
`659`	`659`	`}`
`660`	`660`	`}`
`661`	`661`	`}`