Inline the used cfg options

Author: bruceg

vdev/src/commands/build.rs

@@ -34,7 +34,7 @@ impl Cli {
         command.arg("--features");
         if !self.feature.is_empty() {
             command.args([self.feature.join(",")]);
-        } else if platform::windows() {
+        } else if cfg!(windows) {
             command.arg("default-msvc");
         } else {
             command.arg("default");

vdev/src/commands/test.rs

@@ -3,7 +3,6 @@ use clap::Args;
 use std::collections::BTreeMap;
 
 use crate::app;
-use crate::platform;
 use crate::testing::{config::RustToolchainConfig, runner::*};
 
 /// Execute tests
@@ -43,7 +42,7 @@ impl Cli {
             args.extend(extra_args.to_owned());
 
             if !(self.container || extra_args.contains(&"--features".to_string())) {
-                if platform::windows() {
+                if cfg!(windows) {
                     args.extend(["--features".to_string(), "default-msvc".to_string()]);
                 } else {
                     args.extend(["--features".to_string(), "default".to_string()]);

vdev/src/platform.rs

@@ -27,29 +27,15 @@ pub fn data_dir() -> PathBuf {
 }
 
 pub fn default_target() -> String {
-    if windows() {
+    if cfg!(windows) {
         format!("{}-pc-windows-msvc", ARCH)
-    } else if macos() {
+    } else if cfg!(macos) {
         format!("{}-apple-darwin", ARCH)
     } else {
         format!("{}-unknown-linux-gnu", ARCH)
     }
 }
 
-pub const fn windows() -> bool {
-    cfg!(windows)
-}
-
-#[allow(dead_code)]
-pub const fn macos() -> bool {
-    cfg!(target_os = "macos")
-}
-
-#[allow(dead_code)]
-pub const fn unix() -> bool {
-    cfg!(not(any(windows, target_os = "macos")))
-}
-
 #[once]
 fn _project_dirs() -> Option<ProjectDirs> {
     ProjectDirs::from("", "vector", "vdev")