Skip to content

Commit cc7c326

Browse files
committed
---
yaml --- r: 118638 b: refs/heads/try c: 72c08a4 h: refs/heads/master v: v3
1 parent 5864cee commit cc7c326

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: b1646cbfd908dc948b251e362669af421100647a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: d6736a1440d42f6af967a8a20ab8d73522112b72
5-
refs/heads/try: 19260b043b84dd44e2be26a66771ad621dbf1a59
5+
refs/heads/try: 72c08a4f8f52da100d1c3e7ffe06e9ad4f3a0e28
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustdoc/test.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ pub fn maketest(s: &str, cratename: Option<&str>, lints: bool) -> String {
209209
");
210210
}
211211

212-
if !s.contains("extern crate") {
212+
// Don't inject `extern crate std` because it's already injected by the
213+
// compiler.
214+
if !s.contains("extern crate") && cratename != Some("std") {
213215
match cratename {
214216
Some(cratename) => {
215217
if s.contains(cratename) {

0 commit comments

Comments
 (0)