about summary refs log tree commit diff
path: root/src/librustc_resolve
diff options
context:
space:
mode:
authorDouglas Campos <qmx@qmx.me>2018-08-27 12:36:30 +0000
committerDouglas Campos <qmx@qmx.me>2018-08-27 12:36:30 +0000
commitae853752d82451ce9432f1e22df64e970bc3fd73 (patch)
treed706881afc25b37071572fd6810c27db2cd813bf /src/librustc_resolve
parent32da6ccc490a429542bf861daf3e4fd553545d37 (diff)
downloadrust-ae853752d82451ce9432f1e22df64e970bc3fd73.tar.gz
rust-ae853752d82451ce9432f1e22df64e970bc3fd73.zip
no need to special case std
Diffstat (limited to 'src/librustc_resolve')
-rw-r--r--src/librustc_resolve/lib.rs12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 8c0e591414b..9c23aeb41a3 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -4273,12 +4273,9 @@ 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)
-                            let first_segment_ident = segms[0].ident;
-                            if first_segment_ident.name != "std" {
-                                segms.insert(
-                                    0, ast::PathSegment::from_ident(crate_name)
-                                );
-                            }
+                            segms.insert(
+                                0, ast::PathSegment::from_ident(crate_name)
+                            );
                         }
 
                         segms.push(ast::PathSegment::from_ident(ident));
@@ -4307,8 +4304,7 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
 
                     let is_extern_crate_that_also_appears_in_prelude =
                         name_binding.is_extern_crate() &&
-                        self.session.rust_2018() &&
-                        self.extern_prelude.contains(&ident.name);
+                        self.session.rust_2018();
 
                     let is_visible_to_user =
                         !in_module_is_extern || name_binding.vis == ty::Visibility::Public;