2013-12-22 13:23:04 -06:00
|
|
|
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2013-12-21 16:28:04 -06:00
|
|
|
use std::cell::RefCell;
|
2013-12-22 13:23:04 -06:00
|
|
|
use std::hashmap::HashSet;
|
|
|
|
use std::local_data;
|
|
|
|
use std::os;
|
|
|
|
use std::run;
|
|
|
|
use std::str;
|
|
|
|
|
|
|
|
use extra::tempfile::TempDir;
|
|
|
|
use extra::test;
|
Redesign output flags for rustc
This commit removes the -c, --emit-llvm, -s, --rlib, --dylib, --staticlib,
--lib, and --bin flags from rustc, adding the following flags:
* --emit=[asm,ir,bc,obj,link]
* --crate-type=[dylib,rlib,staticlib,bin,lib]
The -o option has also been redefined to be used for *all* flavors of outputs.
This means that we no longer ignore it for libraries. The --out-dir remains the
same as before.
The new logic for files that rustc emits is as follows:
1. Output types are dictated by the --emit flag. The default value is
--emit=link, and this option can be passed multiple times and have all
options stacked on one another.
2. Crate types are dictated by the --crate-type flag and the #[crate_type]
attribute. The flags can be passed many times and stack with the crate
attribute.
3. If the -o flag is specified, and only one output type is specified, the
output will be emitted at this location. If more than one output type is
specified, then the filename of -o is ignored, and all output goes in the
directory that -o specifies. The -o option always ignores the --out-dir
option.
4. If the --out-dir flag is specified, all output goes in this directory.
5. If -o and --out-dir are both not present, all output goes in the current
directory of the process.
6. When multiple output types are specified, the filestem of all output is the
same as the name of the CrateId (derived from a crate attribute or from the
filestem of the crate file).
Closes #7791
Closes #11056
Closes #11667
2014-02-03 17:27:54 -06:00
|
|
|
use rustc::back::link;
|
2013-12-22 13:23:04 -06:00
|
|
|
use rustc::driver::driver;
|
|
|
|
use rustc::driver::session;
|
2013-12-25 12:10:33 -06:00
|
|
|
use rustc::metadata::creader::Loader;
|
2014-02-02 17:20:32 -06:00
|
|
|
use getopts;
|
2013-12-22 13:23:04 -06:00
|
|
|
use syntax::diagnostic;
|
|
|
|
use syntax::parse;
|
|
|
|
|
|
|
|
use core;
|
|
|
|
use clean;
|
|
|
|
use clean::Clean;
|
|
|
|
use fold::DocFolder;
|
|
|
|
use html::markdown;
|
|
|
|
use passes;
|
|
|
|
use visit_ast::RustdocVisitor;
|
|
|
|
|
|
|
|
pub fn run(input: &str, matches: &getopts::Matches) -> int {
|
2014-02-06 16:38:33 -06:00
|
|
|
let parsesess = parse::new_parse_sess();
|
2014-01-27 07:58:40 -06:00
|
|
|
let input_path = Path::new(input);
|
|
|
|
let input = driver::FileInput(input_path.clone());
|
2013-12-22 13:23:04 -06:00
|
|
|
let libs = matches.opt_strs("L").map(|s| Path::new(s.as_slice()));
|
2013-12-21 16:28:04 -06:00
|
|
|
let libs = @RefCell::new(libs.move_iter().collect());
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2014-01-13 10:31:05 -06:00
|
|
|
let sessopts = @session::Options {
|
2013-12-26 23:48:35 -06:00
|
|
|
binary: ~"rustdoc",
|
2013-12-22 13:23:04 -06:00
|
|
|
maybe_sysroot: Some(@os::self_exe_path().unwrap().dir_path()),
|
|
|
|
addl_lib_search_paths: libs,
|
Redesign output flags for rustc
This commit removes the -c, --emit-llvm, -s, --rlib, --dylib, --staticlib,
--lib, and --bin flags from rustc, adding the following flags:
* --emit=[asm,ir,bc,obj,link]
* --crate-type=[dylib,rlib,staticlib,bin,lib]
The -o option has also been redefined to be used for *all* flavors of outputs.
This means that we no longer ignore it for libraries. The --out-dir remains the
same as before.
The new logic for files that rustc emits is as follows:
1. Output types are dictated by the --emit flag. The default value is
--emit=link, and this option can be passed multiple times and have all
options stacked on one another.
2. Crate types are dictated by the --crate-type flag and the #[crate_type]
attribute. The flags can be passed many times and stack with the crate
attribute.
3. If the -o flag is specified, and only one output type is specified, the
output will be emitted at this location. If more than one output type is
specified, then the filename of -o is ignored, and all output goes in the
directory that -o specifies. The -o option always ignores the --out-dir
option.
4. If the --out-dir flag is specified, all output goes in this directory.
5. If -o and --out-dir are both not present, all output goes in the current
directory of the process.
6. When multiple output types are specified, the filestem of all output is the
same as the name of the CrateId (derived from a crate attribute or from the
filestem of the crate file).
Closes #7791
Closes #11056
Closes #11667
2014-02-03 17:27:54 -06:00
|
|
|
crate_types: ~[session::CrateTypeDylib],
|
2013-12-22 13:23:04 -06:00
|
|
|
.. (*session::basic_options()).clone()
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2014-02-06 16:38:33 -06:00
|
|
|
let diagnostic_handler = diagnostic::mk_handler();
|
2013-12-22 13:23:04 -06:00
|
|
|
let span_diagnostic_handler =
|
|
|
|
diagnostic::mk_span_handler(diagnostic_handler, parsesess.cm);
|
|
|
|
|
|
|
|
let sess = driver::build_session_(sessopts,
|
2014-01-27 07:58:40 -06:00
|
|
|
Some(input_path),
|
2013-12-22 13:23:04 -06:00
|
|
|
parsesess.cm,
|
|
|
|
span_diagnostic_handler);
|
|
|
|
|
|
|
|
let cfg = driver::build_configuration(sess);
|
2014-02-05 11:16:44 -06:00
|
|
|
let crate = driver::phase_1_parse_input(sess, cfg, &input);
|
2013-12-25 12:10:33 -06:00
|
|
|
let loader = &mut Loader::new(sess);
|
2014-02-05 11:16:44 -06:00
|
|
|
let (crate, _) = driver::phase_2_configure_and_expand(sess, loader, crate);
|
2013-12-22 13:23:04 -06:00
|
|
|
|
|
|
|
let ctx = @core::DocContext {
|
|
|
|
crate: crate,
|
|
|
|
tycx: None,
|
|
|
|
sess: sess,
|
|
|
|
};
|
|
|
|
local_data::set(super::ctxtkey, ctx);
|
|
|
|
|
2014-01-07 20:46:16 -06:00
|
|
|
let mut v = RustdocVisitor::new(ctx, None);
|
2013-12-22 13:23:04 -06:00
|
|
|
v.visit(&ctx.crate);
|
|
|
|
let crate = v.clean();
|
|
|
|
let (crate, _) = passes::unindent_comments(crate);
|
|
|
|
let (crate, _) = passes::collapse_docs(crate);
|
|
|
|
|
|
|
|
let mut collector = Collector {
|
|
|
|
tests: ~[],
|
|
|
|
names: ~[],
|
|
|
|
cnt: 0,
|
|
|
|
libs: libs,
|
|
|
|
cratename: crate.name.to_owned(),
|
|
|
|
};
|
|
|
|
collector.fold_crate(crate);
|
|
|
|
|
|
|
|
let args = matches.opt_strs("test-args");
|
|
|
|
let mut args = args.iter().flat_map(|s| s.words()).map(|s| s.to_owned());
|
|
|
|
let mut args = args.to_owned_vec();
|
|
|
|
args.unshift(~"rustdoctest");
|
|
|
|
|
|
|
|
test::test_main(args, collector.tests);
|
|
|
|
|
|
|
|
0
|
|
|
|
}
|
|
|
|
|
|
|
|
fn runtest(test: &str, cratename: &str, libs: HashSet<Path>) {
|
|
|
|
let test = maketest(test, cratename);
|
2014-02-06 16:38:33 -06:00
|
|
|
let parsesess = parse::new_parse_sess();
|
2014-01-13 10:31:05 -06:00
|
|
|
let input = driver::StrInput(test);
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2014-01-13 10:31:05 -06:00
|
|
|
let sessopts = @session::Options {
|
2013-12-26 23:48:35 -06:00
|
|
|
binary: ~"rustdoctest",
|
2013-12-22 13:23:04 -06:00
|
|
|
maybe_sysroot: Some(@os::self_exe_path().unwrap().dir_path()),
|
2013-12-21 16:28:04 -06:00
|
|
|
addl_lib_search_paths: @RefCell::new(libs),
|
Redesign output flags for rustc
This commit removes the -c, --emit-llvm, -s, --rlib, --dylib, --staticlib,
--lib, and --bin flags from rustc, adding the following flags:
* --emit=[asm,ir,bc,obj,link]
* --crate-type=[dylib,rlib,staticlib,bin,lib]
The -o option has also been redefined to be used for *all* flavors of outputs.
This means that we no longer ignore it for libraries. The --out-dir remains the
same as before.
The new logic for files that rustc emits is as follows:
1. Output types are dictated by the --emit flag. The default value is
--emit=link, and this option can be passed multiple times and have all
options stacked on one another.
2. Crate types are dictated by the --crate-type flag and the #[crate_type]
attribute. The flags can be passed many times and stack with the crate
attribute.
3. If the -o flag is specified, and only one output type is specified, the
output will be emitted at this location. If more than one output type is
specified, then the filename of -o is ignored, and all output goes in the
directory that -o specifies. The -o option always ignores the --out-dir
option.
4. If the --out-dir flag is specified, all output goes in this directory.
5. If -o and --out-dir are both not present, all output goes in the current
directory of the process.
6. When multiple output types are specified, the filestem of all output is the
same as the name of the CrateId (derived from a crate attribute or from the
filestem of the crate file).
Closes #7791
Closes #11056
Closes #11667
2014-02-03 17:27:54 -06:00
|
|
|
crate_types: ~[session::CrateTypeExecutable],
|
2014-01-21 11:39:00 -06:00
|
|
|
debugging_opts: session::PREFER_DYNAMIC,
|
Redesign output flags for rustc
This commit removes the -c, --emit-llvm, -s, --rlib, --dylib, --staticlib,
--lib, and --bin flags from rustc, adding the following flags:
* --emit=[asm,ir,bc,obj,link]
* --crate-type=[dylib,rlib,staticlib,bin,lib]
The -o option has also been redefined to be used for *all* flavors of outputs.
This means that we no longer ignore it for libraries. The --out-dir remains the
same as before.
The new logic for files that rustc emits is as follows:
1. Output types are dictated by the --emit flag. The default value is
--emit=link, and this option can be passed multiple times and have all
options stacked on one another.
2. Crate types are dictated by the --crate-type flag and the #[crate_type]
attribute. The flags can be passed many times and stack with the crate
attribute.
3. If the -o flag is specified, and only one output type is specified, the
output will be emitted at this location. If more than one output type is
specified, then the filename of -o is ignored, and all output goes in the
directory that -o specifies. The -o option always ignores the --out-dir
option.
4. If the --out-dir flag is specified, all output goes in this directory.
5. If -o and --out-dir are both not present, all output goes in the current
directory of the process.
6. When multiple output types are specified, the filestem of all output is the
same as the name of the CrateId (derived from a crate attribute or from the
filestem of the crate file).
Closes #7791
Closes #11056
Closes #11667
2014-02-03 17:27:54 -06:00
|
|
|
output_types: ~[link::OutputTypeExe],
|
2013-12-22 13:23:04 -06:00
|
|
|
.. (*session::basic_options()).clone()
|
|
|
|
};
|
|
|
|
|
2014-02-06 16:38:33 -06:00
|
|
|
let diagnostic_handler = diagnostic::mk_handler();
|
2013-12-22 13:23:04 -06:00
|
|
|
let span_diagnostic_handler =
|
|
|
|
diagnostic::mk_span_handler(diagnostic_handler, parsesess.cm);
|
|
|
|
|
|
|
|
let sess = driver::build_session_(sessopts,
|
2014-01-27 07:58:40 -06:00
|
|
|
None,
|
2013-12-22 13:23:04 -06:00
|
|
|
parsesess.cm,
|
|
|
|
span_diagnostic_handler);
|
|
|
|
|
|
|
|
let outdir = TempDir::new("rustdoctest").expect("rustdoc needs a tempdir");
|
|
|
|
let out = Some(outdir.path().clone());
|
|
|
|
let cfg = driver::build_configuration(sess);
|
|
|
|
driver::compile_input(sess, cfg, &input, &out, &None);
|
|
|
|
|
|
|
|
let exe = outdir.path().join("rust_out");
|
|
|
|
let out = run::process_output(exe.as_str().unwrap(), []);
|
|
|
|
match out {
|
2014-01-30 13:30:21 -06:00
|
|
|
Err(e) => fail!("couldn't run the test: {}", e),
|
|
|
|
Ok(out) => {
|
2013-12-22 13:23:04 -06:00
|
|
|
if !out.status.success() {
|
|
|
|
fail!("test executable failed:\n{}",
|
|
|
|
str::from_utf8(out.error));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-15 18:26:20 -06:00
|
|
|
fn maketest(s: &str, cratename: &str) -> ~str {
|
2013-12-22 13:23:04 -06:00
|
|
|
let mut prog = ~r"
|
|
|
|
#[deny(warnings)];
|
|
|
|
#[allow(unused_variable, dead_assignment, unused_mut, attribute_usage, dead_code)];
|
|
|
|
";
|
|
|
|
if s.contains("extra") {
|
|
|
|
prog.push_str("extern mod extra;\n");
|
|
|
|
}
|
|
|
|
if s.contains(cratename) {
|
|
|
|
prog.push_str(format!("extern mod {};\n", cratename));
|
|
|
|
}
|
|
|
|
if s.contains("fn main") {
|
|
|
|
prog.push_str(s);
|
|
|
|
} else {
|
|
|
|
prog.push_str("fn main() {\n");
|
|
|
|
prog.push_str(s);
|
|
|
|
prog.push_str("\n}");
|
|
|
|
}
|
|
|
|
|
2014-01-15 18:26:20 -06:00
|
|
|
return prog;
|
2013-12-22 13:23:04 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
pub struct Collector {
|
|
|
|
priv tests: ~[test::TestDescAndFn],
|
|
|
|
priv names: ~[~str],
|
2013-12-21 16:28:04 -06:00
|
|
|
priv libs: @RefCell<HashSet<Path>>,
|
2013-12-22 13:23:04 -06:00
|
|
|
priv cnt: uint,
|
|
|
|
priv cratename: ~str,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Collector {
|
|
|
|
pub fn add_test(&mut self, test: &str, ignore: bool, should_fail: bool) {
|
|
|
|
let test = test.to_owned();
|
|
|
|
let name = format!("{}_{}", self.names.connect("::"), self.cnt);
|
|
|
|
self.cnt += 1;
|
2013-12-21 16:28:04 -06:00
|
|
|
let libs = self.libs.borrow();
|
|
|
|
let libs = (*libs.get()).clone();
|
2013-12-22 13:23:04 -06:00
|
|
|
let cratename = self.cratename.to_owned();
|
2013-12-28 17:54:56 -06:00
|
|
|
debug!("Creating test {}: {}", name, test);
|
2013-12-22 13:23:04 -06:00
|
|
|
self.tests.push(test::TestDescAndFn {
|
|
|
|
desc: test::TestDesc {
|
|
|
|
name: test::DynTestName(name),
|
|
|
|
ignore: ignore,
|
|
|
|
should_fail: should_fail,
|
|
|
|
},
|
|
|
|
testfn: test::DynTestFn(proc() {
|
|
|
|
runtest(test, cratename, libs);
|
|
|
|
}),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl DocFolder for Collector {
|
|
|
|
fn fold_item(&mut self, item: clean::Item) -> Option<clean::Item> {
|
|
|
|
let pushed = match item.name {
|
|
|
|
Some(ref name) if name.len() == 0 => false,
|
|
|
|
Some(ref name) => { self.names.push(name.to_owned()); true }
|
|
|
|
None => false
|
|
|
|
};
|
|
|
|
match item.doc_value() {
|
|
|
|
Some(doc) => {
|
|
|
|
self.cnt = 0;
|
|
|
|
markdown::find_testable_code(doc, self);
|
|
|
|
}
|
|
|
|
None => {}
|
|
|
|
}
|
|
|
|
let ret = self.fold_item_recur(item);
|
|
|
|
if pushed {
|
|
|
|
self.names.pop();
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|