diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-23 15:13:15 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-23 15:13:15 -0700 |
| commit | c608084ff595c9c31e78ad3cde07093e68ee1848 (patch) | |
| tree | b9b8d61635eb7b5cc12c738f4c60f868c1334a40 /src/libcoretest | |
| parent | d8b06284ea88bdebdd95317e1313bd05a2ef5388 (diff) | |
| parent | 8c93a79e387f5197e8b8fe73b3d87d2b101b7c4a (diff) | |
| download | rust-c608084ff595c9c31e78ad3cde07093e68ee1848.tar.gz rust-c608084ff595c9c31e78ad3cde07093e68ee1848.zip | |
rollup merge of #23598: brson/gate
Conflicts: src/compiletest/compiletest.rs src/libcollections/lib.rs src/librustc_back/lib.rs src/libserialize/lib.rs src/libstd/lib.rs src/libtest/lib.rs src/test/run-make/rustdoc-default-impl/foo.rs src/test/run-pass/env-home-dir.rs
Diffstat (limited to 'src/libcoretest')
| -rw-r--r-- | src/libcoretest/lib.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libcoretest/lib.rs b/src/libcoretest/lib.rs index 536bce0d05f..33f9b63bc49 100644 --- a/src/libcoretest/lib.rs +++ b/src/libcoretest/lib.rs @@ -24,6 +24,8 @@ #![feature(io)] #![feature(collections)] #![feature(debug_builders)] +#![feature(unique)] +#![feature(step_by)] #![allow(deprecated)] // rand extern crate core; |