diff options
| author | bors <bors@rust-lang.org> | 2018-02-22 11:25:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-22 11:25:16 +0000 |
| commit | b1f8e6fb06d7362eeb2065347a7db94e76b1cb2f (patch) | |
| tree | ea754de87eb50d309210d6dbf8b9abf769b956b3 /src/librustdoc/test.rs | |
| parent | 27a046e9338fb0455c33b13e8fe28da78212dedc (diff) | |
| parent | 24c17cb1a878547191a206bae49a6dadf63df452 (diff) | |
| download | rust-b1f8e6fb06d7362eeb2065347a7db94e76b1cb2f.tar.gz rust-b1f8e6fb06d7362eeb2065347a7db94e76b1cb2f.zip | |
Auto merge of #48399 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 12 pull requests - Successful merges: #47379, #47833, #48106, #48198, #48314, #48325, #48335, #48352, #48354, #48360, #48382, #48397 - Failed merges:
Diffstat (limited to 'src/librustdoc/test.rs')
| -rw-r--r-- | src/librustdoc/test.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 90b6746d91d..12c4076c9a5 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -414,7 +414,8 @@ fn partition_source(s: &str) -> (String, String) { for line in s.lines() { let trimline = line.trim(); let header = trimline.is_whitespace() || - trimline.starts_with("#!["); + trimline.starts_with("#![") || + trimline.starts_with("extern crate"); if !header || after_header { after_header = true; after.push_str(line); @@ -814,8 +815,8 @@ use asdf::qwop; assert_eq!(2+2, 4);"; let expected = "#![allow(unused)] -fn main() { extern crate asdf; +fn main() { use asdf::qwop; assert_eq!(2+2, 4); }".to_string(); |
