Simplify Cache wrapper to single type, impl Deref on it, fix all compilation errors...

[rust.git] / src / librustdoc / lib.rs

diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 277475f6fffd876869ec13e8eae523f80eafecd0..be3644ecf96a7ad1436d23a45a9d5fff00ac1925 100644 (file)
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -14,7 +14,7 @@
 #![feature(crate_visibility_modifier)]
 #![feature(const_fn)]
 #![feature(drain_filter)]
-#![feature(never_type)]
+#![cfg_attr(bootstrap, feature(never_type))]
 #![feature(unicode_internals)]
 
 #![recursion_limit="256"]
@@ -24,6 +24,7 @@
 extern crate rustc;
 extern crate rustc_data_structures;
 extern crate rustc_driver;
+extern crate rustc_feature;
 extern crate rustc_error_codes;
 extern crate rustc_index;
 extern crate rustc_resolve;
@@ -144,7 +145,7 @@ fn opts() -> Vec<RustcOptGroup> {
         stable("extern", |o| {
             o.optmulti("", "extern", "pass an --extern to rustc", "NAME[=PATH]")
         }),
-        stable("extern-private", |o| {
+        unstable("extern-private", |o| {
             o.optmulti("", "extern-private",
                        "pass an --extern to rustc (compatibility only)", "NAME=PATH")
         }),