Skip to content

Commit

Permalink
Remove some '#[feature]' attributes for stabilized features
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed Jun 11, 2018
1 parent 999690c commit fd6e08a
Show file tree
Hide file tree
Showing 20 changed files with 9 additions and 33 deletions.
1 change: 0 additions & 1 deletion src/doc/unstable-book/src/library-features/alloc-system.md
Expand Up @@ -61,7 +61,6 @@ crate.io’s `jemallocator` crate provides equivalent functionality.)
jemallocator = "0.1"
```
```rust,ignore
#![feature(global_allocator)]
#![crate_type = "dylib"]
extern crate jemallocator;
Expand Down
1 change: 0 additions & 1 deletion src/liballoc_system/lib.rs
Expand Up @@ -14,7 +14,6 @@
reason = "this library is unlikely to be stabilized in its current \
form or name",
issue = "32838")]
#![feature(global_allocator)]
#![feature(allocator_api)]
#![feature(core_intrinsics)]
#![feature(staged_api)]
Expand Down
3 changes: 1 addition & 2 deletions src/librustc_asan/lib.rs
Expand Up @@ -10,8 +10,7 @@

#![sanitizer_runtime]
#![feature(alloc_system)]
#![feature(allocator_api)]
#![feature(global_allocator)]
#![cfg_attr(stage0, feature(global_allocator))]
#![feature(sanitizer_runtime)]
#![feature(staged_api)]
#![no_std]
Expand Down
5 changes: 2 additions & 3 deletions src/librustc_lsan/lib.rs
Expand Up @@ -9,10 +9,9 @@
// except according to those terms.

#![sanitizer_runtime]
#![feature(sanitizer_runtime)]
#![feature(alloc_system)]
#![feature(allocator_api)]
#![feature(global_allocator)]
#![cfg_attr(stage0, feature(global_allocator))]
#![feature(sanitizer_runtime)]
#![feature(staged_api)]
#![no_std]
#![unstable(feature = "sanitizer_runtime_lib",
Expand Down
5 changes: 2 additions & 3 deletions src/librustc_msan/lib.rs
Expand Up @@ -9,10 +9,9 @@
// except according to those terms.

#![sanitizer_runtime]
#![feature(sanitizer_runtime)]
#![feature(alloc_system)]
#![feature(allocator_api)]
#![feature(global_allocator)]
#![cfg_attr(stage0, feature(global_allocator))]
#![feature(sanitizer_runtime)]
#![feature(staged_api)]
#![no_std]
#![unstable(feature = "sanitizer_runtime_lib",
Expand Down
3 changes: 1 addition & 2 deletions src/librustc_tsan/lib.rs
Expand Up @@ -10,8 +10,7 @@

#![sanitizer_runtime]
#![feature(alloc_system)]
#![feature(allocator_api)]
#![feature(global_allocator)]
#![cfg_attr(stage0, feature(global_allocator))]
#![feature(sanitizer_runtime)]
#![feature(staged_api)]
#![no_std]
Expand Down
1 change: 0 additions & 1 deletion src/libstd/lib.rs
Expand Up @@ -263,7 +263,6 @@
#![feature(fnbox)]
#![feature(futures_api)]
#![feature(hashmap_internals)]
#![feature(heap_api)]
#![feature(int_error_internals)]
#![feature(integer_atomics)]
#![feature(into_cow)]
Expand Down
Expand Up @@ -10,7 +10,6 @@

// no-prefer-dynamic

#![feature(global_allocator, allocator_api)]
#![crate_type = "rlib"]

use std::alloc::System;
Expand Down
Expand Up @@ -10,7 +10,6 @@

// no-prefer-dynamic

#![feature(global_allocator, allocator_api)]
#![crate_type = "rlib"]

use std::alloc::System;
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/allocator/function-allocator.rs
Expand Up @@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(global_allocator)]

#[global_allocator]
fn foo() {} //~ ERROR: allocators must be statics
Expand Down
2 changes: 0 additions & 2 deletions src/test/compile-fail/allocator/not-an-allocator.rs
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(global_allocator, heap_api)]

#[global_allocator]
static A: usize = 0;
//~^ the trait bound `usize:
Expand Down
2 changes: 0 additions & 2 deletions src/test/compile-fail/allocator/two-allocators.rs
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(global_allocator, allocator_api)]

use std::alloc::System;

#[global_allocator]
Expand Down
2 changes: 0 additions & 2 deletions src/test/compile-fail/allocator/two-allocators2.rs
Expand Up @@ -12,8 +12,6 @@
// no-prefer-dynamic
// error-pattern: the #[global_allocator] in

#![feature(global_allocator, allocator_api)]

extern crate system_allocator;

use std::alloc::System;
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/allocator/two-allocators3.rs
Expand Up @@ -13,7 +13,6 @@
// no-prefer-dynamic
// error-pattern: the #[global_allocator] in

#![feature(global_allocator)]

extern crate system_allocator;
extern crate system_allocator2;
Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/std-core-cycle/foo.rs
Expand Up @@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(global_allocator)]
#![crate_type = "cdylib"]

extern crate bar;
Expand Down
5 changes: 1 addition & 4 deletions src/test/run-pass-valgrind/issue-44800.rs
Expand Up @@ -8,11 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(global_allocator, alloc_system, allocator_api)]
extern crate alloc_system;

use std::alloc::System;
use std::collections::VecDeque;
use alloc_system::System;

#[global_allocator]
static ALLOCATOR: System = System;
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/allocator/auxiliary/custom-as-global.rs
Expand Up @@ -10,7 +10,6 @@

// no-prefer-dynamic

#![feature(global_allocator)]
#![crate_type = "rlib"]

extern crate custom;
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/allocator/custom.rs
Expand Up @@ -11,7 +11,7 @@
// aux-build:helper.rs
// no-prefer-dynamic

#![feature(global_allocator, heap_api, allocator_api)]
#![feature(allocator_api)]

extern crate helper;

Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/allocator/xcrate-use.rs
Expand Up @@ -12,7 +12,7 @@
// aux-build:helper.rs
// no-prefer-dynamic

#![feature(global_allocator, heap_api, allocator_api)]
#![feature(allocator_api)]

extern crate custom;
extern crate helper;
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/thin-lto-global-allocator.rs
Expand Up @@ -11,8 +11,6 @@
// compile-flags: -Z thinlto -C codegen-units=2
// min-llvm-version 4.0

#![feature(allocator_api, global_allocator)]

#[global_allocator]
static A: std::alloc::System = std::alloc::System;

Expand Down

0 comments on commit fd6e08a

Please sign in to comment.