From b3d6597855d290d53f4f7bc80a5da07d5a5d5193 Mon Sep 17 00:00:00 2001
From: QuietMisdreavus <grey@quietmisdreavus.net>
Date: Fri, 9 Feb 2018 14:43:21 -0600
Subject: [PATCH 1/2] move manual "extern crate" statements outside auto "fn
 main" in doctests

---
 src/librustdoc/test.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index 08258489a2ec2..f811eea0f8771 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -417,7 +417,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);
@@ -858,8 +859,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();

From d8d4c583be96d9eb654891288829af9410b68e1c Mon Sep 17 00:00:00 2001
From: QuietMisdreavus <grey@quietmisdreavus.net>
Date: Mon, 12 Feb 2018 10:32:04 -0600
Subject: [PATCH 2/2] fix E0260 error index doctest

---
 src/librustc_resolve/diagnostics.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
index 8a29155d12d5b..c1e6b4f5a17d9 100644
--- a/src/librustc_resolve/diagnostics.rs
+++ b/src/librustc_resolve/diagnostics.rs
@@ -325,6 +325,8 @@ Erroneous code example:
 extern crate core;
 
 struct core;
+
+fn main() {}
 ```
 
 There are two possible solutions: