Skip to content

Commit 21ba03e

Browse files
PramodBishtPramodBisht
committed
Fixed 53359: E0432 unresolved import on the same line is now emiting one diagnostic
Addressed estebank's comments for 53359
1 parent c2afca3 commit 21ba03e

File tree

5 files changed

+86
-27
lines changed

5 files changed

+86
-27
lines changed

‎src/librustc_resolve/lib.rs‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,6 @@ enum ResolutionError<'a> {
160160
SelfImportCanOnlyAppearOnceInTheList,
161161
/// error E0431: `self` import can only appear in an import list with a non-empty prefix
162162
SelfImportOnlyInImportListWithNonEmptyPrefix,
163-
/// error E0432: unresolved import
164-
UnresolvedImport(Option<(Span, &'a str, &'a str)>),
165163
/// error E0433: failed to resolve
166164
FailedToResolve(&'a str),
167165
/// error E0434: can't capture dynamic environment in a fn item
@@ -357,17 +355,6 @@ fn resolve_struct_error<'sess, 'a>(resolver: &'sess Resolver,
357355
err.span_label(span, "can only appear in an import list with a non-empty prefix");
358356
err
359357
}
360-
ResolutionError::UnresolvedImport(name) => {
361-
let (span, msg) = match name {
362-
Some((sp, n, _)) => (sp, format!("unresolved import `{}`", n)),
363-
None => (span, "unresolved import".to_owned()),
364-
};
365-
let mut err = struct_span_err!(resolver.session, span, E0432, "{}", msg);
366-
if let Some((_, _, p)) = name {
367-
err.span_label(span, p);
368-
}
369-
err
370-
}
371358
ResolutionError::FailedToResolve(msg) => {
372359
let mut err = struct_span_err!(resolver.session, span, E0433,
373360
"failed to resolve. {}", msg);

‎src/librustc_resolve/resolve_imports.rs‎

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use syntax::ext::base::Determinacy::{self, Determined, Undetermined};
3131
use syntax::ext::hygiene::Mark;
3232
use syntax::symbol::keywords;
3333
use syntax::util::lev_distance::find_best_match_for_name;
34-
use syntax_pos::Span;
34+
use syntax_pos::{MultiSpan, Span};
3535

3636
use std::cell::{Cell, RefCell};
3737
use std::collections::BTreeMap;
@@ -635,6 +635,8 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
635635

636636
let mut errors = false;
637637
let mut seen_spans = FxHashSet();
638+
let mut error_vec = Vec::new();
639+
let mut prev_root_id: NodeId = NodeId::new(0);
638640
for i in 0 .. self.determined_imports.len() {
639641
let import = self.determined_imports[i];
640642
let error = self.finalize_import(import);
@@ -689,13 +691,22 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
689691
// If the error is a single failed import then create a "fake" import
690692
// resolution for it so that later resolve stages won't complain.
691693
self.import_dummy_binding(import);
694+
if prev_root_id.as_u32() != 0 &&
695+
prev_root_id.as_u32() != import.root_id.as_u32() &&
696+
!error_vec.is_empty(){
697+
// in case of new import line, throw diagnostic message
698+
// for previous line.
699+
let mut empty_vec = vec![];
700+
mem::swap(&mut empty_vec, &mut error_vec);
701+
self.throw_unresolved_import_error(empty_vec, None);
702+
}
692703
if !seen_spans.contains(&span) {
693704
let path = import_path_to_string(&import.module_path[..],
694705
&import.subclass,
695706
span);
696-
let error = ResolutionError::UnresolvedImport(Some((span, &path, &err)));
697-
resolve_error(self.resolver, span, error);
707+
error_vec.push((span, path, err));
698708
seen_spans.insert(span);
709+
prev_root_id = import.root_id;
699710
}
700711
}
701712
}
@@ -760,21 +771,48 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
760771
});
761772
}
762773

774+
if !error_vec.is_empty() {
775+
self.throw_unresolved_import_error(error_vec.clone(), None);
776+
}
777+
763778
// Report unresolved imports only if no hard error was already reported
764779
// to avoid generating multiple errors on the same import.
765780
if !errors {
766781
for import in &self.indeterminate_imports {
767782
if import.is_uniform_paths_canary {
768783
continue;
769784
}
770-
771-
let error = ResolutionError::UnresolvedImport(None);
772-
resolve_error(self.resolver, import.span, error);
785+
self.throw_unresolved_import_error(error_vec, Some(MultiSpan::from(import.span)));
773786
break;
774787
}
775788
}
776789
}
777790

791+
fn throw_unresolved_import_error(&self, error_vec: Vec<(Span, String, String)>,
792+
span: Option<MultiSpan>) {
793+
let max_span_label_msg_count = 10; // upper limit on number of span_label message.
794+
let (span,msg) = match error_vec.is_empty() {
795+
true => (span.unwrap(), "unresolved import".to_string()),
796+
false => {
797+
let span = MultiSpan::from_spans(error_vec.clone().into_iter()
798+
.map(|elem: (Span, String, String)| { elem.0 }
799+
).collect());
800+
let path_vec: Vec<String> = error_vec.clone().into_iter()
801+
.map(|elem: (Span, String, String)| { format!("`{}`", elem.1) }
802+
).collect();
803+
let path = path_vec.join(", ");
804+
let msg = format!("unresolved import{} {}",
805+
if path_vec.len() > 1 { "s" } else { "" }, path);
806+
(span, msg)
807+
}
808+
};
809+
let mut err = struct_span_err!(self.resolver.session, span, E0432, "{}", &msg);
810+
for span_error in error_vec.into_iter().take(max_span_label_msg_count) {
811+
err.span_label(span_error.0, span_error.2);
812+
}
813+
err.emit();
814+
}
815+
778816
/// Attempts to resolve the given import, returning true if its resolution is determined.
779817
/// If successful, the resolved bindings are written into the module.
780818
fn resolve_import(&mut self, directive: &'b ImportDirective<'b>) -> bool {

‎src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
error[E0432]: unresolved import `a::$crate`
2-
--> $DIR/dollar-crate-is-keyword-2.rs:15:13
1+
error[E0433]: failed to resolve. `$crate` in paths can only be used in start position
2+
--> $DIR/dollar-crate-is-keyword-2.rs:16:16
33
|
4-
LL | use a::$crate; //~ ERROR unresolved import `a::$crate`
5-
| ^^^^^^^^^ no `$crate` in `a`
4+
LL | use a::$crate::b; //~ ERROR `$crate` in paths can only be used in start position
5+
| ^^^^^^ `$crate` in paths can only be used in start position
66
...
77
LL | m!();
88
| ----- in this macro invocation
99

10-
error[E0433]: failed to resolve. `$crate` in paths can only be used in start position
11-
--> $DIR/dollar-crate-is-keyword-2.rs:16:16
10+
error[E0432]: unresolved import `a::$crate`
11+
--> $DIR/dollar-crate-is-keyword-2.rs:15:13
1212
|
13-
LL | use a::$crate::b; //~ ERROR `$crate` in paths can only be used in start position
14-
| ^^^^^^ `$crate` in paths can only be used in start position
13+
LL | use a::$crate; //~ ERROR unresolved import `a::$crate`
14+
| ^^^^^^^^^ no `$crate` in `a`
1515
...
1616
LL | m!();
1717
| ----- in this macro invocation

‎src/test/ui/issue-53565.rs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
use std::time::{foo, bar, buzz};
11+
use std::time::{abc, def};
12+
fn main(){
13+
println!("Hello World!");
14+
}

‎src/test/ui/issue-53565.stderr‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
error[E0432]: unresolved imports `std::time::foo`, `std::time::bar`, `std::time::buzz`
2+
--> $DIR/issue-53565.rs:10:17
3+
|
4+
LL | use std::time::{foo, bar, buzz};
5+
| ^^^ ^^^ ^^^^ no `buzz` in `time`
6+
| | |
7+
| | no `bar` in `time`
8+
| no `foo` in `time`
9+
10+
error[E0432]: unresolved imports `std::time::abc`, `std::time::def`
11+
--> $DIR/issue-53565.rs:11:17
12+
|
13+
LL | use std::time::{abc, def};
14+
| ^^^ ^^^ no `def` in `time`
15+
| |
16+
| no `abc` in `time`
17+
18+
error: aborting due to 2 previous errors
19+
20+
For more information about this error, try `rustc --explain E0432`.

0 commit comments

Comments
 (0)