Skip to content

Commit 319b052

Browse files
committed
Fix stage 2 tests
1 parent 8cee487 commit 319b052

File tree

11 files changed

+10
-13
lines changed

11 files changed

+10
-13
lines changed

src/liballoc/lib.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@
7474
#![needs_allocator]
7575
#![deny(missing_debug_implementations)]
7676

77-
#![cfg_attr(test, allow(deprecated))] // rand
77+
#![cfg_attr(not(test), feature(fn_traits))]
7878
#![cfg_attr(not(test), feature(generator_trait))]
79-
#![cfg_attr(test, feature(rand, test))]
79+
#![cfg_attr(test, feature(test))]
80+
8081
#![feature(allocator_api)]
8182
#![feature(allow_internal_unstable)]
8283
#![feature(arbitrary_self_types)]
@@ -117,9 +118,6 @@
117118
#![feature(rustc_const_unstable)]
118119
#![feature(const_vec_new)]
119120

120-
#![cfg_attr(not(test), feature(fn_traits))]
121-
#![cfg_attr(test, feature(test))]
122-
123121
// Allow testing this library
124122

125123
#[cfg(test)]

src/liballoc/tests/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
#![feature(exact_size_is_empty)]
1818
#![feature(pattern)]
1919
#![feature(slice_sort_by_cached_key)]
20-
#![feature(splice)]
2120
#![feature(str_escape)]
22-
#![feature(string_retain)]
2321
#![feature(try_reserve)]
2422
#![feature(unboxed_closures)]
2523
#![feature(exact_chunks)]

src/libcore/tests/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#![feature(refcell_map_split)]
2727
#![feature(refcell_replace_swap)]
2828
#![feature(slice_patterns)]
29-
#![feature(slice_rotate)]
3029
#![feature(sort_internals)]
3130
#![feature(specialization)]
3231
#![feature(step_trait)]

src/libstd/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@
232232

233233
// std is implemented with unstable features, many of which are internal
234234
// compiler details that will never be stable
235+
#![cfg_attr(test, feature(test, update_panic_count))]
235236
#![feature(alloc)]
236237
#![feature(alloc_error_handler)]
237238
#![feature(alloc_system)]
@@ -302,7 +303,6 @@
302303
#![feature(doc_cfg)]
303304
#![feature(doc_masked)]
304305
#![feature(doc_spotlight)]
305-
#![cfg_attr(test, feature(update_panic_count))]
306306
#![cfg_attr(windows, feature(used))]
307307
#![feature(doc_alias)]
308308
#![feature(doc_keyword)]

src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
#![feature(staged_api)]
1313
#![unstable(feature = "unstable_test_feature", issue = "0")]
1414

15-
pub fn baz() { }
15+
pub fn baz() {}

src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs

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

11-
#![feature(test_feature)]
11+
#![feature(unstable_test_feature)]
1212

1313
extern crate bar;
1414

src/test/run-make-fulldeps/link-path-order/main.rs

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

11-
#![feature(libc, exit_status)]
11+
#![feature(libc)]
1212

1313
extern crate libc;
1414

src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// no-prefer-dynamic
1414
// ignore-cloudabi no processes
1515
// ignore-emscripten no processes
16+
// ignore-macos
1617

1718
extern crate exit_success_if_unwind;
1819

src/test/run-pass/panic-runtime/abort.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// no-prefer-dynamic
1313
// ignore-cloudabi no processes
1414
// ignore-emscripten no processes
15+
// ignore-macos
1516

1617
use std::process::Command;
1718
use std::env;

src/test/run-pass/panic-runtime/link-to-abort.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// compile-flags:-C panic=abort
1212
// no-prefer-dynamic
13+
// ignore-macos
1314

1415
#![feature(panic_abort)]
1516

0 commit comments

Comments
 (0)