bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add a test

Browse source 
And fix bustage in make check
This commit is contained in:
Nick Cameron 2016-01-05 14:35:22 +13:00
parent b976d9e666
commit 11dcb48c6a
8 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustdoc/lib.rs
View file

@ -50,6 +50,7 @@ extern crate serialize as rustc_serialize; // used by deriving
use std::cell::RefCell;
use std::collections::HashMap;
use std::default::Default;
use std::env;
use std::fs::File;
use std::io::{self, Read, Write};
@ -62,7 +63,7 @@ use externalfiles::ExternalHtml;
use serialize::Decodable;
use serialize::json::{self, Json};
use rustc::session::search_paths::SearchPaths;
use syntax::errors::emitter::ColorConfig;
use rustc::session::config::ErrorOutputType;
// reexported from `clean` so it can be easily updated with the mod itself
pub use clean::SCHEMA_VERSION;
@ -225,7 +226,7 @@ pub fn main_args(args: &[String]) -> isize {
let mut libs = SearchPaths::new();
for s in &matches.opt_strs("L") {
libs.add_path(s, ColorConfig::Auto);
libs.add_path(s, ErrorOutputType::default());
}
let externs = match parse_externs(&matches) {
Ok(ex) => ex,
@ -360,7 +361,7 @@ fn rust_input(cratefile: &str, externs: core::Externs, matches: &getopts::Matche
// First, parse the crate and extract all relevant information.
let mut paths = SearchPaths::new();
for s in &matches.opt_strs("L") {
paths.add_path(s, ColorConfig::Auto);
paths.add_path(s, ErrorOutputType::default());
}
let cfgs = matches.opt_strs("cfg");
let triple = matches.opt_str("target");