Auto merge of #37911 - liigo:rustdoc-playground, r=alexcrichton

rustdoc: get back missing crate-name when --playground-url is used

follow up PR #37763
r? @alexcrichton (since you r+ed to #37763 )

----

Edit: When `#![doc(html_playground_url="")]` is used, the current crate name is saved to `PLAYGROUND`, so rustdoc may generate `extern crate NAME;` into code snips automatically. But when `--playground-url` was introduced in PR #37763, I forgot saving crate name to `PLAYGROUND`. This PR fix that.

----

Update:
- add test
- unstable `--playground-url`
This commit is contained in:
bors
2016-12-01 07:07:32 +00:00
4 changed files with 40 additions and 10 deletions

View File

@@ -160,10 +160,10 @@ pub fn opts() -> Vec<RustcOptGroup> {
unstable(optmulti("Z", "",
"internal and debugging options (only on nightly build)", "FLAG")),
stable(optopt("", "sysroot", "Override the system root", "PATH")),
stable(optopt("", "playground-url",
"URL to send code snippets to, may be reset by --markdown-playground-url \
or `#![doc(html_playground_url=...)]`",
"URL")),
unstable(optopt("", "playground-url",
"URL to send code snippets to, may be reset by --markdown-playground-url \
or `#![doc(html_playground_url=...)]`",
"URL")),
]
}
@@ -232,10 +232,6 @@ pub fn main_args(args: &[String]) -> isize {
}
};
if let Some(playground) = matches.opt_str("playground-url") {
html::markdown::PLAYGROUND.with(|s| { *s.borrow_mut() = Some((None, playground)); });
}
let test_args = matches.opt_strs("test-args");
let test_args: Vec<String> = test_args.iter()
.flat_map(|s| s.split_whitespace())
@@ -264,6 +260,7 @@ pub fn main_args(args: &[String]) -> isize {
None => return 3
};
let crate_name = matches.opt_str("crate-name");
let playground_url = matches.opt_str("playground-url");
match (should_test, markdown_input) {
(true, true) => {
@@ -285,7 +282,7 @@ pub fn main_args(args: &[String]) -> isize {
info!("going to format");
match output_format.as_ref().map(|s| &**s) {
Some("html") | None => {
html::render::run(krate, &external_html,
html::render::run(krate, &external_html, playground_url,
output.unwrap_or(PathBuf::from("doc")),
passes.into_iter().collect(),
css_file_extension,