diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 17:42:47 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 17:42:47 -0800 |
| commit | 373cbab5b08d6630da58f28d2166c19afc327fa6 (patch) | |
| tree | 860d19575778256a9345ce33d5eeef6b54f91300 /src/libtest | |
| parent | d11bfba71bb71e05ab93e1576a07a48269b13021 (diff) | |
| parent | ae4bcd41e8014b6057fe0a328c87f32f917396ba (diff) | |
| download | rust-373cbab5b08d6630da58f28d2166c19afc327fa6.tar.gz rust-373cbab5b08d6630da58f28d2166c19afc327fa6.zip | |
rollup merge of #20723: pnkfelix/feature-gate-box-syntax
Conflicts: src/compiletest/compiletest.rs src/libcollections/lib.rs src/libserialize/lib.rs src/libsyntax/feature_gate.rs
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index b6fc6462aa4..d04308814f8 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -31,7 +31,9 @@ #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://doc.rust-lang.org/nightly/")] +#![allow(unknown_features)] #![feature(asm, slicing_syntax)] +#![feature(box_syntax)] extern crate getopts; extern crate regex; |