nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deterministic external crate suggestion.

Browse Source 
This commit ensures that the external crate suggestion is deterministic
by using a `BTreeMap` rather than a `FxHashMap`. This is particularly
useful as `std` and `core` will often contain the same items and
therefore the suggestion would previously suggest either for any given
error - in this case, the suggestion will always prefer `std` now.
This commit is contained in:
David Wood 2018-10-03 15:20:20 +02:00
parent 9d408e0511
commit 5872d3eacd
No known key found for this signature in database
GPG Key ID: 01760B4F9F53F154
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/librustc_resolve/error_reporting.rs
View File

@ -10,8 +10,10 @@
use {CrateLint, PathResult};
use std::collections::BTreeSet;
use syntax::ast::Ident;
use syntax::symbol::keywords;
use syntax::symbol::{keywords, Symbol};
use syntax_pos::Span;
use resolve_imports::ImportResolver;
@ -131,14 +133,19 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
span: Span,
mut path: Vec<Ident>
) -> Option<Vec<Ident>> {
// Need to clone else we can't call `resolve_path` without a borrow error.
let external_crate_names = self.resolver.session.extern_prelude.clone();
// Need to clone else we can't call `resolve_path` without a borrow error. We also store
// into a `BTreeMap` so we can get consistent ordering (and therefore the same diagnostic)
// each time.
let external_crate_names: BTreeSet<Symbol> = self.resolver.session.extern_prelude
.clone().drain().collect();
// Insert a new path segment that we can replace.
let new_path_segment = path[0].clone();
path.insert(1, new_path_segment);
for name in &external_crate_names {
// Iterate in reverse so that we start with crates at the end of the alphabet. This means
// that we'll always get `std` before `core`.
for name in external_crate_names.iter().rev() {
let ident = Ident::with_empty_ctxt(*name);
// Calling `maybe_process_path_extern` ensures that we're only running `resolve_path`
// on a crate name that won't ICE.