diff options
| author | bors <bors@rust-lang.org> | 2015-02-16 00:46:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-16 00:46:43 +0000 |
| commit | c5db290bf6df986a6acd5ce993f278c18e55ca37 (patch) | |
| tree | 5a67ed2bb3601bc1d5f477057324421fbd2291c3 /src/libtest | |
| parent | 342ab53bf858a89e418973ba3bfff55161c0b174 (diff) | |
| parent | cea2bbfe27707becaacad1ce64b835b408c0ccf8 (diff) | |
| download | rust-c5db290bf6df986a6acd5ce993f278c18e55ca37.tar.gz rust-c5db290bf6df986a6acd5ce993f278c18e55ca37.zip | |
Auto merge of #22367 - Manishearth:rollup, r=steveklabnik
(still testing locally)
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index cc468df87f3..860ce209d45 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -32,7 +32,7 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://doc.rust-lang.org/nightly/")] -#![feature(asm, slicing_syntax)] +#![feature(asm)] #![feature(box_syntax)] #![feature(collections)] #![feature(core)] |