diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 09:23:42 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 09:23:42 -0800 |
| commit | 735c308aedbdf73d98bfaceacd5f38152d8eee1b (patch) | |
| tree | 9e2a67565a411343625c31ca149196f284d6b12b /src/liballoc | |
| parent | 4dab96758aeb9ffaeedc7993cdabcf163f4fd491 (diff) | |
| parent | 82a2e8e31016ace5ee67c89b852dcc8e1fa09e32 (diff) | |
| download | rust-735c308aedbdf73d98bfaceacd5f38152d8eee1b.tar.gz rust-735c308aedbdf73d98bfaceacd5f38152d8eee1b.zip | |
rollup merge of #20416: nikomatsakis/coherence
Conflicts: src/test/run-pass/issue-15734.rs src/test/run-pass/issue-3743.rs
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 61b5d43d1cb..d17a54ce6e5 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -64,7 +64,8 @@ html_root_url = "http://doc.rust-lang.org/nightly/")] #![no_std] -#![feature(lang_items, phase, unsafe_destructor, default_type_params)] +#![allow(unknown_features)] +#![feature(lang_items, phase, unsafe_destructor, default_type_params, old_orphan_check)] #[phase(plugin, link)] extern crate core; |