Skip to content

Commit 54d7daf

Browse files
committed
Remove some '#[feature]' attributes for stabilized features
1 parent d557771 commit 54d7daf

File tree

20 files changed

+9
-33
lines changed

20 files changed

+9
-33
lines changed

src/doc/unstable-book/src/library-features/alloc-system.md

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ crate.io’s `jemallocator` crate provides equivalent functionality.)
6161
jemallocator = "0.1"
6262
```
6363
```rust,ignore
64-
#![feature(global_allocator)]
6564
#![crate_type = "dylib"]
6665
6766
extern crate jemallocator;

src/liballoc_system/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
reason = "this library is unlikely to be stabilized in its current \
1515
form or name",
1616
issue = "32838")]
17-
#![feature(global_allocator)]
1817
#![feature(allocator_api)]
1918
#![feature(core_intrinsics)]
2019
#![feature(staged_api)]

src/librustc_asan/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
#![sanitizer_runtime]
1212
#![feature(alloc_system)]
13-
#![feature(allocator_api)]
14-
#![feature(global_allocator)]
13+
#![cfg_attr(stage0, feature(global_allocator))]
1514
#![feature(sanitizer_runtime)]
1615
#![feature(staged_api)]
1716
#![no_std]

src/librustc_lsan/lib.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
// except according to those terms.
1010

1111
#![sanitizer_runtime]
12-
#![feature(sanitizer_runtime)]
1312
#![feature(alloc_system)]
14-
#![feature(allocator_api)]
15-
#![feature(global_allocator)]
13+
#![cfg_attr(stage0, feature(global_allocator))]
14+
#![feature(sanitizer_runtime)]
1615
#![feature(staged_api)]
1716
#![no_std]
1817
#![unstable(feature = "sanitizer_runtime_lib",

src/librustc_msan/lib.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
// except according to those terms.
1010

1111
#![sanitizer_runtime]
12-
#![feature(sanitizer_runtime)]
1312
#![feature(alloc_system)]
14-
#![feature(allocator_api)]
15-
#![feature(global_allocator)]
13+
#![cfg_attr(stage0, feature(global_allocator))]
14+
#![feature(sanitizer_runtime)]
1615
#![feature(staged_api)]
1716
#![no_std]
1817
#![unstable(feature = "sanitizer_runtime_lib",

src/librustc_tsan/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
#![sanitizer_runtime]
1212
#![feature(alloc_system)]
13-
#![feature(allocator_api)]
14-
#![feature(global_allocator)]
13+
#![cfg_attr(stage0, feature(global_allocator))]
1514
#![feature(sanitizer_runtime)]
1615
#![feature(staged_api)]
1716
#![no_std]

src/libstd/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@
262262
#![feature(fn_traits)]
263263
#![feature(fnbox)]
264264
#![feature(hashmap_internals)]
265-
#![feature(heap_api)]
266265
#![feature(int_error_internals)]
267266
#![feature(integer_atomics)]
268267
#![feature(into_cow)]

src/test/compile-fail/allocator/auxiliary/system-allocator.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// no-prefer-dynamic
1212

13-
#![feature(global_allocator, allocator_api)]
1413
#![crate_type = "rlib"]
1514

1615
use std::alloc::System;

src/test/compile-fail/allocator/auxiliary/system-allocator2.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// no-prefer-dynamic
1212

13-
#![feature(global_allocator, allocator_api)]
1413
#![crate_type = "rlib"]
1514

1615
use std::alloc::System;

src/test/compile-fail/allocator/function-allocator.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(global_allocator)]
1211

1312
#[global_allocator]
1413
fn foo() {} //~ ERROR: allocators must be statics

src/test/compile-fail/allocator/not-an-allocator.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(global_allocator, heap_api)]
12-
1311
#[global_allocator]
1412
static A: usize = 0;
1513
//~^ the trait bound `usize:

src/test/compile-fail/allocator/two-allocators.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(global_allocator, allocator_api)]
12-
1311
use std::alloc::System;
1412

1513
#[global_allocator]

src/test/compile-fail/allocator/two-allocators2.rs

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
// no-prefer-dynamic
1313
// error-pattern: the #[global_allocator] in
1414

15-
#![feature(global_allocator, allocator_api)]
16-
1715
extern crate system_allocator;
1816

1917
use std::alloc::System;

src/test/compile-fail/allocator/two-allocators3.rs

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// no-prefer-dynamic
1414
// error-pattern: the #[global_allocator] in
1515

16-
#![feature(global_allocator)]
1716

1817
extern crate system_allocator;
1918
extern crate system_allocator2;

src/test/run-make-fulldeps/std-core-cycle/foo.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(global_allocator)]
1211
#![crate_type = "cdylib"]
1312

1413
extern crate bar;

src/test/run-pass-valgrind/issue-44800.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(global_allocator, alloc_system, allocator_api)]
12-
extern crate alloc_system;
13-
11+
use std::alloc::System;
1412
use std::collections::VecDeque;
15-
use alloc_system::System;
1613

1714
#[global_allocator]
1815
static ALLOCATOR: System = System;

src/test/run-pass/allocator/auxiliary/custom-as-global.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// no-prefer-dynamic
1212

13-
#![feature(global_allocator)]
1413
#![crate_type = "rlib"]
1514

1615
extern crate custom;

src/test/run-pass/allocator/custom.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// aux-build:helper.rs
1212
// no-prefer-dynamic
1313

14-
#![feature(global_allocator, heap_api, allocator_api)]
14+
#![feature(allocator_api)]
1515

1616
extern crate helper;
1717

src/test/run-pass/allocator/xcrate-use.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// aux-build:helper.rs
1313
// no-prefer-dynamic
1414

15-
#![feature(global_allocator, heap_api, allocator_api)]
15+
#![feature(allocator_api)]
1616

1717
extern crate custom;
1818
extern crate helper;

src/test/run-pass/thin-lto-global-allocator.rs

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
// compile-flags: -Z thinlto -C codegen-units=2
1212
// min-llvm-version 4.0
1313

14-
#![feature(allocator_api, global_allocator)]
15-
1614
#[global_allocator]
1715
static A: std::alloc::System = std::alloc::System;
1816

0 commit comments

Comments
 (0)