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

Test fixes and rebase conflicts, round 2

Browse source
This commit is contained in:
Alex Crichton 2015-03-27 13:22:26 -07:00
parent 1c78478c12
commit d65fee28d3
6 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustdoc/lib.rs
View file

@ -27,7 +27,6 @@
#![feature(exit_status)]
#![feature(set_stdio)]
#![feature(libc)]
#![feature(old_path)]
#![feature(rustc_private)]
#![feature(staged_api)]
#![feature(std_misc)]
@ -65,8 +64,6 @@ use std::path::PathBuf;
use std::rc::Rc;
use std::sync::mpsc::channel;
#[allow(deprecated)] use std::old_path::Path;
use externalfiles::ExternalHtml;
use serialize::Decodable;
use serialize::json::{self, Json};
@ -434,7 +431,7 @@ fn rust_input(cratefile: &str, externs: core::Externs, matches: &getopts::Matche
// Load all plugins/passes into a PluginManager
let path = matches.opt_str("plugin-path")
.unwrap_or("/tmp/rustdoc/plugins".to_string());
let mut pm = plugins::PluginManager::new(Path::new(path));
let mut pm = plugins::PluginManager::new(PathBuf::from(path));
for pass in &passes {
let plugin = match PASSES.iter()
.position(|&(p, _, _)| {

6
src/librustdoc/plugins.rs
View file

@ -16,7 +16,7 @@ use std::dynamic_lib as dl;
use serialize::json;
use std::mem;
use std::string::String;
use std::old_path::{Path, GenericPath};
use std::path::PathBuf;
pub type PluginJson = Option<(String, json::Json)>;
pub type PluginResult = (clean::Crate, PluginJson);
@ -27,12 +27,12 @@ pub struct PluginManager {
dylibs: Vec<dl::DynamicLibrary> ,
callbacks: Vec<PluginCallback> ,
/// The directory plugins will be loaded from
pub prefix: Path,
pub prefix: PathBuf,
}
impl PluginManager {
/// Create a new plugin manager
pub fn new(prefix: Path) -> PluginManager {
pub fn new(prefix: PathBuf) -> PluginManager {
PluginManager {
dylibs: Vec::new(),
callbacks: Vec::new(),