Skip to content

Commit

Permalink
rustdoc: Use --crate-name with --test
Browse files Browse the repository at this point in the history
This ensures that the name of the crate is set from the command line for tests
so the auto-injection of `extern crate <name>` in doc tests works correctly.
  • Loading branch information
alexcrichton committed Aug 1, 2014
1 parent 8cda74c commit 4dbe3eb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,14 @@ pub fn main_args(args: &[String]) -> int {
Some(eh) => eh,
None => return 3
};
let crate_name = matches.opt_str("crate-name");

match (should_test, markdown_input) {
(true, true) => {
return markdown::test(input, libs, externs, test_args)
}
(true, false) => {
return test::run(input, cfgs, libs, externs, test_args)
return test::run(input, cfgs, libs, externs, test_args, crate_name)
}
(false, true) => return markdown::render(input, output.unwrap_or(Path::new("doc")),
&matches, &external_html,
Expand Down
9 changes: 7 additions & 2 deletions src/librustdoc/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ pub fn run(input: &str,
cfgs: Vec<String>,
libs: HashSet<Path>,
externs: core::Externs,
mut test_args: Vec<String>)
mut test_args: Vec<String>,
crate_name: Option<String>)
-> int {
let input_path = Path::new(input);
let input = driver::FileInput(input_path.clone());
Expand Down Expand Up @@ -87,7 +88,11 @@ pub fn run(input: &str,

let mut v = RustdocVisitor::new(&*ctx, None);
v.visit(&ctx.krate);
let krate = v.clean();
let mut krate = v.clean();
match crate_name {
Some(name) => krate.name = name,
None => {}
}
let (krate, _) = passes::collapse_docs(krate);
let (krate, _) = passes::unindent_comments(krate);

Expand Down

5 comments on commit 4dbe3eb

@bors
Copy link
Contributor

@bors bors commented on 4dbe3eb Aug 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from huonw
at alexcrichton@4dbe3eb

@bors
Copy link
Contributor

@bors bors commented on 4dbe3eb Aug 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/rustdoc-tests = 4dbe3eb into auto

@bors
Copy link
Contributor

@bors bors commented on 4dbe3eb Aug 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/rustdoc-tests = 4dbe3eb merged ok, testing candidate = 6248858

@bors
Copy link
Contributor

@bors bors commented on 4dbe3eb Aug 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 6248858

Please sign in to comment.