diff options
| author | bors <bors@rust-lang.org> | 2015-09-27 11:01:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-27 11:01:11 +0000 |
| commit | 638b2608a70171593471b45fb344741a37230b0d (patch) | |
| tree | dc53b7eac13b589e6e4135493bf24892cd09eb06 /src/libstd | |
| parent | 219eca11b044de3644b3e9101124513c1a842b09 (diff) | |
| parent | c34f3eaebc2f805864d3de9c7ce257eb41a6def2 (diff) | |
| download | rust-638b2608a70171593471b45fb344741a37230b0d.tar.gz rust-638b2608a70171593471b45fb344741a37230b0d.zip | |
Auto merge of #28689 - Manishearth:rollup, r=Manishearth
- Successful merges: #28664, #28673, #28681, #28682, #28688 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 9129ffcc211..10c7190ca0c 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -249,8 +249,8 @@ #![feature(wrapping)] #![feature(zero_one)] #![cfg_attr(windows, feature(str_utf16))] -#![cfg_attr(test, feature(float_from_str_radix, range_inclusive, float_extras, hash_default))] -#![cfg_attr(test, feature(test, rustc_private, float_consts))] +#![cfg_attr(test, feature(float_from_str_radix, range_inclusive, float_extras))] +#![cfg_attr(test, feature(test, rustc_private))] #![cfg_attr(target_env = "msvc", feature(link_args))] // Don't link to std. We are std. |