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/libtime | |
| 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/libtime')
| -rw-r--r-- | src/libtime/lib.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs index d9db2d80ada..bc5d0c21aae 100644 --- a/src/libtime/lib.rs +++ b/src/libtime/lib.rs @@ -20,7 +20,10 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://doc.rust-lang.org/nightly/", html_playground_url = "http://play.rust-lang.org/")] + +#![allow(unknown_features)] #![feature(phase, globs)] +#![feature(old_orphan_check)] #[cfg(test)] #[phase(plugin, link)] extern crate log; |