From 66ffe1df967a071826add3d2c70224d65085558e Mon Sep 17 00:00:00 2001 From: Ashley Williams Date: Mon, 24 Sep 2018 20:30:25 -0400 Subject: [PATCH] fix(style): appease cargo fmt --- tests/all/bindgen.rs | 24 ++++++++++-------------- tests/all/test.rs | 30 +++++++++++++----------------- tests/all/webdriver.rs | 28 ++++++++++++---------------- 3 files changed, 35 insertions(+), 47 deletions(-) diff --git a/tests/all/bindgen.rs b/tests/all/bindgen.rs index 9066e95..b79d58c 100644 --- a/tests/all/bindgen.rs +++ b/tests/all/bindgen.rs @@ -2,13 +2,11 @@ use tempfile; use wasm_pack::bindgen; #[test] -#[cfg( - any( - all(target_os = "linux", target_arch = "x86_64"), - all(target_os = "macos", target_arch = "x86_64"), - all(windows, target_arch = "x86_64"), - ) -)] +#[cfg(any( + all(target_os = "linux", target_arch = "x86_64"), + all(target_os = "macos", target_arch = "x86_64"), + all(windows, target_arch = "x86_64"), +))] fn can_download_prebuilt_wasm_bindgen() { use std::env; let dir = tempfile::TempDir::new().unwrap(); @@ -30,13 +28,11 @@ fn can_download_prebuilt_wasm_bindgen() { } #[test] -#[cfg( - any( - all(target_os = "linux", target_arch = "x86_64"), - all(target_os = "macos", target_arch = "x86_64"), - all(windows, target_arch = "x86_64"), - ) -)] +#[cfg(any( + all(target_os = "linux", target_arch = "x86_64"), + all(target_os = "macos", target_arch = "x86_64"), + all(windows, target_arch = "x86_64"), +))] fn downloading_prebuilt_wasm_bindgen_handles_http_errors() { let dir = tempfile::TempDir::new().unwrap(); let bad_version = "0.2.21-some-trailing-version-stuff-that-does-not-exist"; diff --git a/tests/all/test.rs b/tests/all/test.rs index a9173fa..63757b1 100644 --- a/tests/all/test.rs +++ b/tests/all/test.rs @@ -35,14 +35,12 @@ fn it_can_run_tests_with_different_wbg_test_and_wbg_versions() { } #[test] -#[cfg( - any( - all(target_os = "linux", target_arch = "x86_64"), - all(target_os = "macos", target_arch = "x86_64"), - all(target_os = "windows", target_arch = "x86"), - all(target_os = "windows", target_arch = "x86_64") - ) -)] +#[cfg(any( + all(target_os = "linux", target_arch = "x86_64"), + all(target_os = "macos", target_arch = "x86_64"), + all(target_os = "windows", target_arch = "x86"), + all(target_os = "windows", target_arch = "x86_64") +))] fn it_can_run_browser_tests() { let fixture = fixture::wbg_test_browser(); fixture.install_local_wasm_bindgen(); @@ -105,15 +103,13 @@ fn it_can_run_failing_tests() { } #[test] -#[cfg( - any( - all(target_os = "linux", target_arch = "x86"), - all(target_os = "linux", target_arch = "x86_64"), - all(target_os = "macos", target_arch = "x86_64"), - all(target_os = "windows", target_arch = "x86"), - all(target_os = "windows", target_arch = "x86_64") - ) -)] +#[cfg(any( + all(target_os = "linux", target_arch = "x86"), + all(target_os = "linux", target_arch = "x86_64"), + all(target_os = "macos", target_arch = "x86_64"), + all(target_os = "windows", target_arch = "x86"), + all(target_os = "windows", target_arch = "x86_64") +))] fn it_can_find_a_webdriver_on_path() { let fixture = fixture::wbg_test_browser(); fixture.install_local_wasm_bindgen(); diff --git a/tests/all/webdriver.rs b/tests/all/webdriver.rs index 72b2d28..5e3b0cb 100644 --- a/tests/all/webdriver.rs +++ b/tests/all/webdriver.rs @@ -2,28 +2,24 @@ use utils::fixture; use wasm_pack::test::webdriver; #[test] -#[cfg( - any( - all(target_os = "linux", target_arch = "x86_64"), - all(target_os = "macos", target_arch = "x86_64"), - all(target_os = "windows", target_arch = "x86") - ) -)] +#[cfg(any( + all(target_os = "linux", target_arch = "x86_64"), + all(target_os = "macos", target_arch = "x86_64"), + all(target_os = "windows", target_arch = "x86") +))] fn can_install_chromedriver() { let fixture = fixture::js_hello_world(); assert!(webdriver::install_chromedriver(&fixture.path).is_ok()); } #[test] -#[cfg( - any( - all(target_os = "linux", target_arch = "x86"), - all(target_os = "linux", target_arch = "x86_64"), - all(target_os = "macos", target_arch = "x86_64"), - all(target_os = "windows", target_arch = "x86"), - all(target_os = "windows", target_arch = "x86_64") - ) -)] +#[cfg(any( + all(target_os = "linux", target_arch = "x86"), + all(target_os = "linux", target_arch = "x86_64"), + all(target_os = "macos", target_arch = "x86_64"), + all(target_os = "windows", target_arch = "x86"), + all(target_os = "windows", target_arch = "x86_64") +))] fn can_install_geckodriver() { let fixture = fixture::js_hello_world(); assert!(webdriver::install_geckodriver(&fixture.path).is_ok());