diff options
| author | bors <bors@rust-lang.org> | 2015-04-20 15:23:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-20 15:23:52 +0000 |
| commit | e959fab4a520ed9c08f8eec0340457fa4b1597f2 (patch) | |
| tree | 2289d62a388418c4b7e4f8b45d86debceab1a631 /src | |
| parent | be9a72b9c1499f0583f172700ce4b7c0f3c861d3 (diff) | |
| parent | adc93ceac9a5e3a224b05c9f57d689b373d6b9c1 (diff) | |
| download | rust-e959fab4a520ed9c08f8eec0340457fa4b1597f2.tar.gz rust-e959fab4a520ed9c08f8eec0340457fa4b1597f2.zip | |
Auto merge of #24597 - bombless:doc, r=steveklabnik
This patch will make links like http://doc.rust-lang.org/std/collections/struct.BTreeMap.html#examples actually playable without modifying the code. It seems that this patch cannot be tested on test/rustdoc. And I suggest adding a `&run=1` to those links. Thank @jorisgio for noticing me this! r? @steveklabnik Closes https://github.com/rust-lang/rust/issues/24332
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/test.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 284f2b298a1..4bed38e74fc 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -277,7 +277,7 @@ pub fn maketest(s: &str, cratename: Option<&str>, dont_insert_main: bool, // Don't inject `extern crate std` because it's already injected by the // compiler. - if !s.contains("extern crate") && !opts.no_crate_inject { + if !s.contains("extern crate") && !opts.no_crate_inject && cratename != Some("std") { match cratename { Some(cratename) => { if s.contains(cratename) { |