From ae853752d82451ce9432f1e22df64e970bc3fd73 Mon Sep 17 00:00:00 2001 From: Douglas Campos Date: Mon, 27 Aug 2018 12:36:30 +0000 Subject: [PATCH] no need to special case std --- src/librustc_resolve/lib.rs | 12 ++++-------- .../ui/rust-2018/issue-52202-use-suggestions.stderr | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 8c0e591414b3..9c23aeb41a34 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; diff --git a/src/test/ui/rust-2018/issue-52202-use-suggestions.stderr b/src/test/ui/rust-2018/issue-52202-use-suggestions.stderr index de688f64f039..95158dbd8532 100644 --- a/src/test/ui/rust-2018/issue-52202-use-suggestions.stderr +++ b/src/test/ui/rust-2018/issue-52202-use-suggestions.stderr @@ -9,11 +9,11 @@ LL | use crate::plumbing::Drain; | LL | use std::collections::binary_heap::Drain; | -LL | use std::collections::binary_heap::Drain; - | LL | use std::collections::hash_map::Drain; | -and 9 other candidates +LL | use std::collections::hash_set::Drain; + | +and 3 other candidates error: aborting due to previous error