@@ -176,7 +176,7 @@ pub enum ResolutionError<'a> {
176
176
/// error E0431: `self` import can only appear in an import list with a non-empty prefix
177
177
SelfImportOnlyInImportListWithNonEmptyPrefix ,
178
178
/// error E0432: unresolved import
179
- UnresolvedImport ( Option < ( & ' a str , Option < & ' a str > ) > ) ,
179
+ UnresolvedImport ( Option < ( & ' a str , & ' a str ) > ) ,
180
180
/// error E0433: failed to resolve
181
181
FailedToResolve ( & ' a str ) ,
182
182
/// error E0434: can't capture dynamic environment in a fn item
@@ -359,8 +359,7 @@ fn resolve_error<'b, 'a:'b, 'tcx:'a>(resolver: &'b Resolver<'a, 'tcx>, span: syn
359
359
}
360
360
ResolutionError :: UnresolvedImport ( name) => {
361
361
let msg = match name {
362
- Some ( ( n, Some ( p) ) ) => format ! ( "unresolved import `{}`{}" , n, p) ,
363
- Some ( ( n, None ) ) => format ! ( "unresolved import (maybe you meant `{}::*`?)" , n) ,
362
+ Some ( ( n, p) ) => format ! ( "unresolved import `{}`{}" , n, p) ,
364
363
None => "unresolved import" . to_owned ( )
365
364
} ;
366
365
span_err ! ( resolver. session, span, E0432 , "{}" , msg) ;
@@ -1815,19 +1814,9 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
1815
1814
let imports = module_. imports . borrow ( ) ;
1816
1815
let import_count = imports. len ( ) ;
1817
1816
if index != import_count {
1818
- let sn = self . session
1819
- . codemap ( )
1820
- . span_to_snippet ( ( * imports) [ index] . span )
1821
- . unwrap ( ) ;
1822
- if sn. contains ( "::" ) {
1823
- resolve_error ( self ,
1824
- ( * imports) [ index] . span ,
1825
- ResolutionError :: UnresolvedImport ( None ) ) ;
1826
- } else {
1827
- resolve_error ( self ,
1828
- ( * imports) [ index] . span ,
1829
- ResolutionError :: UnresolvedImport ( Some ( ( & * sn, None ) ) ) ) ;
1830
- }
1817
+ resolve_error ( self ,
1818
+ ( * imports) [ index] . span ,
1819
+ ResolutionError :: UnresolvedImport ( None ) ) ;
1831
1820
}
1832
1821
1833
1822
// Descend into children and anonymous children.
0 commit comments