From 9f84ccf088ba060b93805fc7d0a0287909beaae9 Mon Sep 17 00:00:00 2001
From: Douglas Campos <qmx@qmx.me>
Date: Fri, 17 Aug 2018 00:11:45 +0000
Subject: [PATCH] special-case std

---
 src/librustc_resolve/lib.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 4e72d532a95f..8c0e591414b3 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -4250,7 +4250,7 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
         let mut worklist = Vec::new();
         let mut seen_modules = FxHashSet();
         let not_local_module = crate_name != keywords::Crate.ident();
-        worklist.push((start_module, Vec::new(), not_local_module));
+        worklist.push((start_module, Vec::<ast::PathSegment>::new(), not_local_module));
 
         while let Some((in_module,
                         path_segments,
@@ -4273,10 +4273,12 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
                         if self.session.rust_2018() {
                             // crate-local absolute paths start with `crate::` in edition 2018
                             // FIXME: may also be stabilized for Rust 2015 (Issues #45477, #44660)
-
-                            segms.insert(
-                                0, ast::PathSegment::from_ident(crate_name)
-                            );
+                            let first_segment_ident = segms[0].ident;
+                            if first_segment_ident.name != "std" {
+                                segms.insert(
+                                    0, ast::PathSegment::from_ident(crate_name)
+                                );
+                            }
                         }
 
                         segms.push(ast::PathSegment::from_ident(ident));