From 37abec06e502b147b9ebc730030efe10bf235765 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 8 Sep 2016 01:58:00 +0000 Subject: [PATCH] Tidy --- src/bootstrap/lib.rs | 3 ++- src/librustc_llvm/build.rs | 3 ++- src/test/compile-fail/allocator-dylib-is-system.rs | 2 +- src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs | 2 +- src/test/run-fail/test-panic.rs | 2 +- src/test/run-fail/test-should-fail-bad-message.rs | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 80726951ad87..033cefb8dea3 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -975,7 +975,8 @@ impl Build { // than an entry here. let mut base = Vec::new(); - if target != self.config.build && !target.contains("msvc") && !target.contains("emscripten") { + if target != self.config.build && !target.contains("msvc") && + !target.contains("emscripten") { base.push(format!("-Clinker={}", self.cc(target).display())); } return base diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs index c805fd7c7b64..5257575a94e8 100644 --- a/src/librustc_llvm/build.rs +++ b/src/librustc_llvm/build.rs @@ -66,7 +66,8 @@ fn main() { let host = env::var("HOST").expect("HOST was not set"); let is_crossed = target != host; - let optional_components = ["x86", "arm", "aarch64", "mips", "powerpc", "pnacl", "systemz", "jsbackend"]; + let optional_components = ["x86", "arm", "aarch64", "mips", "powerpc", "pnacl", "systemz", + "jsbackend"]; // FIXME: surely we don't need all these components, right? Stuff like mcjit // or interpreter the compiler itself never uses. diff --git a/src/test/compile-fail/allocator-dylib-is-system.rs b/src/test/compile-fail/allocator-dylib-is-system.rs index 0097de75f94f..4c576de22021 100644 --- a/src/test/compile-fail/allocator-dylib-is-system.rs +++ b/src/test/compile-fail/allocator-dylib-is-system.rs @@ -18,7 +18,7 @@ // system allocator. Do this by linking in jemalloc and making sure that we get // an error. -// ignore-emscripten TODO: What "other allocator" should we use for emcc? +// ignore-emscripten FIXME: What "other allocator" should we use for emcc? #![feature(alloc_jemalloc)] diff --git a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs index a6b49ec86cc7..02c271ab24da 100644 --- a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs +++ b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs @@ -16,7 +16,7 @@ // Ensure that rust dynamic libraries use jemalloc as their allocator, verifying // by linking in the system allocator here and ensuring that we get a complaint. -// ignore-emscripten TODO: What "other allocator" is correct for emscripten? +// ignore-emscripten FIXME: What "other allocator" is correct for emscripten? #![feature(alloc_system)] diff --git a/src/test/run-fail/test-panic.rs b/src/test/run-fail/test-panic.rs index 070095534a4b..21ced01d9d69 100644 --- a/src/test/run-fail/test-panic.rs +++ b/src/test/run-fail/test-panic.rs @@ -12,7 +12,7 @@ // error-pattern:thread 'test_foo' panicked at // compile-flags: --test // ignore-pretty: does not work well with `--test` -// ignore-emscripten +// ignore-emscripten #[test] fn test_foo() { diff --git a/src/test/run-fail/test-should-fail-bad-message.rs b/src/test/run-fail/test-should-fail-bad-message.rs index bd25df3dabd1..74b5f17bcf9b 100644 --- a/src/test/run-fail/test-should-fail-bad-message.rs +++ b/src/test/run-fail/test-should-fail-bad-message.rs @@ -12,7 +12,7 @@ // error-pattern:thread 'test_foo' panicked at // compile-flags: --test // ignore-pretty: does not work well with `--test` -// ignore-emscripten +// ignore-emscripten #[test] #[should_panic(expected = "foobar")]