Merge branch 'master' of github.com:nikomatsakis/ena

Author: nikomatsakis

Cargo.toml

@@ -7,3 +7,6 @@ repository = "https://github.com/nikomatsakis/ena"
 version = "0.4.0"
 authors = ["Niko Matsakis <[email protected]>"]
 
+[features]
+default = ["unstable"]
+unstable = []

src/lib.rs

@@ -8,17 +8,18 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![cfg_attr(test, feature(test))]
+#![cfg_attr(all(feature = "unstable", test), feature(test))]
 #![allow(dead_code)]
-#![feature(conservative_impl_trait)]
-#![feature(static_in_const)]
+#![cfg_attr(feature = "unstable", feature(conservative_impl_trait))]
+#![cfg_attr(feature = "unstable", feature(static_in_const))]
 
 #[macro_use]
 mod debug;
 
 pub mod constraint;
 pub mod graph;
 pub mod snapshot_vec;
+#[cfg(feature = "unstable")]
 pub mod cc;
 pub mod unify;
 pub mod bitvec;

src/unify/tests.rs

@@ -8,7 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[cfg(feature = "unstable")]
 extern crate test;
+#[cfg(feature = "unstable")]
 use self::test::Bencher;
 use std::collections::HashSet;
 use std::cmp;
@@ -61,6 +63,7 @@ fn big_array() {
     }
 }
 
+#[cfg(feature = "unstable")]
 #[bench]
 fn big_array_bench(b: &mut Bencher) {
     let mut ut: UnificationTable<UnitKey> = UnificationTable::new();