auto merge of #11249 : brson/rust/no_rustdoc_ng, r=alexcrichton
This commit is contained in:
commit
2897549d51
|
@ -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() }
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue