OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustdoc: implement --sysroot

Browse Source 
with the same semantics as rustc. This let us build documentation for a
crate that depends on a custom sysroot.
This commit is contained in:
Jorge Aparicio 2016-09-19 15:56:38 -05:00
parent 5f6f838448
commit e0c60b4d02
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustdoc/core.rs
View File

@ -30,6 +30,7 @@ use errors::emitter::ColorConfig;
use std::cell::{RefCell, Cell}; use std::cell::{RefCell, Cell};
use std::rc::Rc; use std::rc::Rc;
use std::path::PathBuf;
use visit_ast::RustdocVisitor; use visit_ast::RustdocVisitor;
use clean; use clean;
@ -101,7 +102,8 @@ pub fn run_core(search_paths: SearchPaths,
cfgs: Vec<String>, cfgs: Vec<String>,
externs: config::Externs, externs: config::Externs,
input: Input, input: Input,
triple: Option<String>) -> (clean::Crate, RenderInfo) triple: Option<String>,
maybe_sysroot: Option<PathBuf>) -> (clean::Crate, RenderInfo)
{ {
// Parse, resolve, and typecheck the given crate. // Parse, resolve, and typecheck the given crate.
@ -113,7 +115,7 @@ pub fn run_core(search_paths: SearchPaths,
let warning_lint = lint::builtin::WARNINGS.name_lower(); let warning_lint = lint::builtin::WARNINGS.name_lower();
let sessopts = config::Options { let sessopts = config::Options {
maybe_sysroot: None, maybe_sysroot: maybe_sysroot,
search_paths: search_paths, search_paths: search_paths,
crate_types: vec!(config::CrateTypeRlib), crate_types: vec!(config::CrateTypeRlib),
lint_opts: vec!((warning_lint, lint::Allow)), lint_opts: vec!((warning_lint, lint::Allow)),

4
src/librustdoc/lib.rs
View File

@ -186,6 +186,7 @@ pub fn opts() -> Vec<RustcOptGroup> {
own theme", "PATH")), own theme", "PATH")),
unstable(optmulti("Z", "", unstable(optmulti("Z", "",
"internal and debugging options (only on nightly build)", "FLAG")), "internal and debugging options (only on nightly build)", "FLAG")),
stable(optopt("", "sysroot", "Override the system root", "PATH")),
) )
} }
@ -370,6 +371,7 @@ fn rust_input(cratefile: &str, externs: Externs, matches: &getopts::Matches) ->
} }
let cfgs = matches.opt_strs("cfg"); let cfgs = matches.opt_strs("cfg");
let triple = matches.opt_str("target"); let triple = matches.opt_str("target");
let maybe_sysroot = matches.opt_str("sysroot").map(PathBuf::from);
let cr = PathBuf::from(cratefile); let cr = PathBuf::from(cratefile);
info!("starting to run rustc"); info!("starting to run rustc");
@ -379,7 +381,7 @@ fn rust_input(cratefile: &str, externs: Externs, matches: &getopts::Matches) ->
use rustc::session::config::Input; use rustc::session::config::Input;
tx.send(core::run_core(paths, cfgs, externs, Input::File(cr), tx.send(core::run_core(paths, cfgs, externs, Input::File(cr),
triple)).unwrap(); triple, maybe_sysroot)).unwrap();
}); });
let (mut krate, renderinfo) = rx.recv().unwrap(); let (mut krate, renderinfo) = rx.recv().unwrap();
info!("finished with rustc"); info!("finished with rustc");