Use cfg_aliases to simplify cfg! expressions

Author: Surkov, Kirill

Cargo.lock

@@ -49,6 +49,9 @@ rmp-serde = "1.3"
 criterion = "0.5"
 hex-literal = "0.4.1"
 
+[build-dependencies]
+cfg_aliases = "0.2.1"
+
 [[bench]]
 name = "peer_id"
 harness = false

identity/Cargo.toml

@@ -0,0 +1,5 @@
+fn main() {
+    cfg_aliases::cfg_aliases! {
+        rsa_supported: { any(not(target_arch = "wasm32"), target_os = "unknown") }
+    }
+}

identity/build.rs

@@ -76,13 +76,7 @@ impl DecodingError {
         }
     }
 
-    #[cfg(all(
-        feature = "rsa",
-        any(
-            not(target_arch = "wasm32"),
-            all(target_arch = "wasm32", target_os = "unknown")
-        )
-    ))]
+    #[cfg(all(feature = "rsa", rsa_supported))]
     pub(crate) fn encoding_unsupported(key_type: &'static str) -> Self {
         Self {
             msg: format!("encoding {key_type} key to Protobuf is unsupported"),
@@ -112,27 +106,15 @@ pub struct SigningError {
 
 /// An error during encoding of key material.
 impl SigningError {
-    #[cfg(all(
-        feature = "rsa",
-        any(
-            not(target_arch = "wasm32"),
-            all(target_arch = "wasm32", target_os = "unknown")
-        )
-    ))]
+    #[cfg(all(feature = "rsa", rsa_supported))]
     pub(crate) fn new<S: ToString>(msg: S) -> Self {
         Self {
             msg: msg.to_string(),
             source: None,
         }
     }
 
-    #[cfg(all(
-        feature = "rsa",
-        any(
-            not(target_arch = "wasm32"),
-            all(target_arch = "wasm32", target_os = "unknown")
-        )
-    ))]
+    #[cfg(all(feature = "rsa", rsa_supported))]
     pub(crate) fn source(self, source: impl Error + Send + Sync + 'static) -> Self {
         Self {
             source: Some(Box::new(source)),