Auto merge of #6758 - dwijnand:reuse-std-env-consts-EXE_SUFFIX, r=ehuss

Reuse std::env::consts::EXE_SUFFIX None
rust-lang · Mar 17, 2019 · 8858383 · 8858383
2 parents 7d09f17 + cd570b3
commit 8858383
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/tests/testsuite/support/install.rs b/tests/testsuite/support/install.rs
@@ -1,3 +1,4 @@
+use std::env::consts::EXE_SUFFIX;
 use std::path::{Path, PathBuf};
 
 use crate::support::paths;
@@ -23,9 +24,5 @@ pub fn cargo_home() -> PathBuf {
 }
 
 pub fn exe(name: &str) -> String {
-    if cfg!(windows) {
-        format!("{}.exe", name)
-    } else {
-        name.to_string()
-    }
+    format!("{}{}", name, EXE_SUFFIX)
 }
diff --git a/tests/testsuite/support/mod.rs b/tests/testsuite/support/mod.rs
@@ -1519,7 +1519,7 @@ fn substitute_macros(input: &str) -> String {
         ("[UNPACKING]", "   Unpacking"),
         ("[SUMMARY]", "     Summary"),
         ("[FIXING]", "      Fixing"),
-        ("[EXE]", if cfg!(windows) { ".exe" } else { "" }),
+        ("[EXE]",           env::consts::EXE_SUFFIX),
     ];
     let mut result = input.to_owned();
     for &(pat, subst) in &macros {