Reduce the number of cfg directives in the relay_list example

Author: buggmagnet

mullvad-api/src/bin/relay_list.rs

@@ -3,47 +3,53 @@
 //! relay list at the time of creating the installer.
 
 #[cfg(not(target_os = "android"))]
-use mullvad_api::{
-    proxy::ApiConnectionMode, rest::Error as RestError, ApiEndpoint, RelayListProxy,
-};
-#[cfg(not(target_os = "android"))]
-use std::process;
-#[cfg(not(target_os = "android"))]
-use talpid_types::ErrorExt;
+mod imp {
+    use mullvad_api::{
+        proxy::ApiConnectionMode, rest::Error as RestError, ApiEndpoint, RelayListProxy,
+    };
+    use std::process;
+    use talpid_types::ErrorExt;
+
+    pub async fn main() {
+        let runtime = mullvad_api::Runtime::new(
+            tokio::runtime::Handle::current(),
+            &ApiEndpoint::from_env_vars(),
+        );
+
+        let relay_list_request = RelayListProxy::new(
+            runtime.mullvad_rest_handle(ApiConnectionMode::Direct.into_provider()),
+        )
+        .relay_list(None)
+        .await;
+
+        let relay_list = match relay_list_request {
+            Ok(relay_list) => relay_list,
+            Err(RestError::TimeoutError) => {
+                eprintln!("Request timed out");
+                process::exit(2);
+            }
+            Err(e @ RestError::DeserializeError(_)) => {
+                eprintln!(
+                    "{}",
+                    e.display_chain_with_msg("Failed to deserialize relay list")
+                );
+                process::exit(3);
+            }
+            Err(e) => {
+                eprintln!("{}", e.display_chain_with_msg("Failed to fetch relay list"));
+                process::exit(1);
+            }
+        };
+        println!("{}", serde_json::to_string_pretty(&relay_list).unwrap());
+    }
+}
 
 #[tokio::main]
-#[cfg(target_os = "android")]
-async fn main() {}
-#[tokio::main]
-#[cfg(not(target_os = "android"))]
 async fn main() {
-    let runtime = mullvad_api::Runtime::new(
-        tokio::runtime::Handle::current(),
-        &ApiEndpoint::from_env_vars(),
-    );
-
-    let relay_list_request =
-        RelayListProxy::new(runtime.mullvad_rest_handle(ApiConnectionMode::Direct.into_provider()))
-            .relay_list(None)
-            .await;
+    imp::main().await
+}
 
-    let relay_list = match relay_list_request {
-        Ok(relay_list) => relay_list,
-        Err(RestError::TimeoutError) => {
-            eprintln!("Request timed out");
-            process::exit(2);
-        }
-        Err(e @ RestError::DeserializeError(_)) => {
-            eprintln!(
-                "{}",
-                e.display_chain_with_msg("Failed to deserialize relay list")
-            );
-            process::exit(3);
-        }
-        Err(e) => {
-            eprintln!("{}", e.display_chain_with_msg("Failed to fetch relay list"));
-            process::exit(1);
-        }
-    };
-    println!("{}", serde_json::to_string_pretty(&relay_list).unwrap());
+#[cfg(target_os = "android")]
+mod imp {
+    pub async fn main() {}
 }