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/libstd | |
| 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/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 6187593afd1..848d3604953 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -107,6 +107,7 @@ #![feature(macro_rules, globs, linkage, thread_local, asm)] #![feature(default_type_params, phase, lang_items, unsafe_destructor)] #![feature(slicing_syntax, unboxed_closures)] +#![feature(old_orphan_check)] // Don't link to std. We are std. #![no_std] |