about summary refs log tree commit diff
path: root/src/liballoc_jemalloc
diff options
context:
space:
mode:
authorJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2017-08-28 02:41:16 +0200
committerJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2017-08-28 02:41:16 +0200
commitd29af3799964caec55e3ee806f2ac0f8d494e481 (patch)
tree0134ce33be6192b6e1f974fa6b7ad694067408b2 /src/liballoc_jemalloc
parent7c5780b3564d98aec130ee2f27368b116a3f1160 (diff)
parente2668882406b68739c6ed33d420358d5d710e67b (diff)
downloadrust-d29af3799964caec55e3ee806f2ac0f8d494e481.tar.gz
rust-d29af3799964caec55e3ee806f2ac0f8d494e481.zip
Merge branch 'master' of https://github.com/rust-lang/rust into gen
Diffstat (limited to 'src/liballoc_jemalloc')
-rw-r--r--src/liballoc_jemalloc/lib.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs
index 3a9cc1dd5a6..efefabc974c 100644
--- a/src/liballoc_jemalloc/lib.rs
+++ b/src/liballoc_jemalloc/lib.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_name = "alloc_jemalloc"]
-#![crate_type = "rlib"]
 #![no_std]
 #![unstable(feature = "alloc_jemalloc",
             reason = "this library is unlikely to be stabilized in its current \
@@ -21,7 +19,7 @@
 #![feature(libc)]
 #![feature(linkage)]
 #![feature(staged_api)]
-#![cfg_attr(dummy_jemalloc, allow(dead_code))]
+#![cfg_attr(dummy_jemalloc, allow(dead_code, unused_extern_crates))]
 #![cfg_attr(not(dummy_jemalloc), feature(allocator_api))]
 
 extern crate alloc;