about summary refs log tree commit diff
path: root/src/liballoc/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-01-16 13:10:59 +0000
committerbors <bors@rust-lang.org>2015-01-16 13:10:59 +0000
commitee2bfae011e368e224d6d4f4c9fad13606ee99da (patch)
tree189eebe03c5b7fba71d429db8e0561a45d1317cb /src/liballoc/lib.rs
parentf3d71be65cccfddd232e733c11129ed53961f980 (diff)
parentcb852239033baf4f44ab448f27127d6ab906c7c0 (diff)
downloadrust-ee2bfae011e368e224d6d4f4c9fad13606ee99da.tar.gz
rust-ee2bfae011e368e224d6d4f4c9fad13606ee99da.zip
auto merge of #20972 : FlaPer87/rust/oibit-send-and-friends, r=nikomatsakis
This PR adds rules for negative implementations. It follows pretty much what the [RFC](https://github.com/rust-lang/rfcs/blob/master/text/0019-opt-in-builtin-traits.md) says with 1 main difference:

Instead of positive implementations override negative implementations, this have been implemented in a way that a negative implementation of `Trait` for `T` will overlap with a positive implementation, causing a coherence error.

@nikomatsakis r?

cc #13231

[breaking-change]
Diffstat (limited to 'src/liballoc/lib.rs')
-rw-r--r--src/liballoc/lib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 4a85637625a..6c853306035 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -68,6 +68,7 @@
 #![allow(unknown_features)]
 #![feature(lang_items, unsafe_destructor)]
 #![feature(box_syntax)]
+#![feature(optin_builtin_traits)]
 #![allow(unknown_features)] #![feature(int_uint)]
 
 #[macro_use]