auto merge of #11249 : brson/rust/no_rustdoc_ng, r=alexcrichton

rust-lang · Jan 1, 2014 · 2897549 · 2897549
2 parents 736f5a8 + 14f59e8
commit 2897549
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/driver/driver.rs b/src/driver/driver.rs
@@ -19,7 +19,4 @@ extern mod this = "rustdoc";
 #[cfg(rustc)]
 extern mod this = "rustc";
 
-#[cfg(rustdoc_ng)]
-extern mod this = "rustdoc_ng";
-
 fn main() { this::main() }
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
@@ -242,7 +242,7 @@ fn rust_input(cratefile: &str, matches: &getopts::Matches) -> Output {
     }
 
     // Load all plugins/passes into a PluginManager
-    let path = matches.opt_str("plugin-path").unwrap_or(~"/tmp/rustdoc_ng/plugins");
+    let path = matches.opt_str("plugin-path").unwrap_or(~"/tmp/rustdoc/plugins");
     let mut pm = plugins::PluginManager::new(Path::new(path));
     for pass in passes.iter() {
         let plugin = match PASSES.iter().position(|&(p, _, _)| p == *pass) {