Use triple macro

wasmerio · Dec 7, 2020 · 624f0ec · 624f0ec
1 parent 249b955
commit 624f0ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/compiler-singlepass/Cargo.toml b/lib/compiler-singlepass/Cargo.toml
@@ -25,6 +25,9 @@ lazy_static = "1.4"
 byteorder = "1.3"
 smallvec = "1.5"
 
+[dev-dependencies]
+target-lexicon = { version = "0.11", default-features = false }
+
 [badges]
 maintenance = { status = "actively-developed" }
 

diff --git a/lib/compiler-singlepass/src/compiler.rs b/lib/compiler-singlepass/src/compiler.rs
@@ -176,6 +176,7 @@ fn to_compile_error<T: ToCompileError>(x: T) -> CompileError {
 mod tests {
     use super::*;
     use std::str::FromStr;
+    use target_lexicon::triple;
     use wasmer_compiler::{CpuFeature, Features, Triple};
     use wasmer_vm::{MemoryStyle, TableStyle};
 
@@ -200,10 +201,7 @@ mod tests {
         let compiler = SinglepassCompiler::new(Singlepass::default());
 
         // Compile for win64
-        let win64 = Target::new(
-            Triple::from_str("x86_64-pc-windows-msvc").unwrap(),
-            CpuFeature::for_host(),
-        );
+        let win64 = Target::new(triple!("x86_64-pc-windows-msvc"), CpuFeature::for_host());
         let (mut info, translation, inputs) = dummy_compilation_ingredients();
         let result = compiler.compile_module(&win64, &mut info, &translation, inputs);
         match result.unwrap_err() {
@@ -212,10 +210,7 @@ mod tests {
         };
 
         // Compile for 32bit Linux
-        let linux32 = Target::new(
-            Triple::from_str("i686-unknown-linux-gnu").unwrap(),
-            CpuFeature::for_host(),
-        );
+        let linux32 = Target::new(triple!("i686-unknown-linux-gnu"), CpuFeature::for_host());
         let (mut info, translation, inputs) = dummy_compilation_ingredients();
         let result = compiler.compile_module(&linux32, &mut info, &translation, inputs);
         match result.unwrap_err() {
@@ -224,10 +219,7 @@ mod tests {
         };
 
         // Compile for win32
-        let win32 = Target::new(
-            Triple::from_str("i686-pc-windows-gnu").unwrap(),
-            CpuFeature::for_host(),
-        );
+        let win32 = Target::new(triple!("i686-pc-windows-gnu"), CpuFeature::for_host());
         let (mut info, translation, inputs) = dummy_compilation_ingredients();
         let result = compiler.compile_module(&win32, &mut info, &translation, inputs);
         match result.unwrap_err() {