user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
bors 2014-01-01 04:36:54 -08:00
commit 2897549d51
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/driver/driver.rs
View file

@ -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() }

2
src/librustdoc/lib.rs
View file

@ -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) {