mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #34963 - petrochenkov:useerr, r=jseyfried

Browse Source 
resolve: Fix ICE and extra diagnostics happening when unresolved imports are used in patterns

Closes https://github.com/rust-lang/rust/issues/34933

r? @jseyfried
This commit is contained in:
Manish Goregaokar 2016-07-28 16:20:10 +05:30
commit 43bcada397
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_resolve/lib.rs
View File

@ -2274,7 +2274,7 @@ fn resolve_pattern_path<ExpectedFn>(&mut self,
let resolution = if let Some(resolution) = self.resolve_possibly_assoc_item(pat_id,
qself, path, namespace) {
if resolution.depth == 0 {
if expected_fn(resolution.base_def) {
if expected_fn(resolution.base_def) || resolution.base_def == Def::Err {
resolution
} else {
resolve_error(
@ -2345,7 +2345,7 @@ fn resolve_pattern(&mut self,
);
None
}
Def::Local(..) | Def::Upvar(..) | Def::Fn(..) => {
Def::Local(..) | Def::Upvar(..) | Def::Fn(..) | Def::Err => {
// These entities are explicitly allowed
// to be shadowed by fresh bindings.
None

27
src/test/compile-fail/unresolved-import-recovery.rs Normal file
View File

@ -0,0 +1,27 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// Check that unresolved imports do not create additional errors and ICEs
mod m {
pub use unresolved; //~ ERROR unresolved import `unresolved`
fn f() {
let unresolved = 0; // OK
}
}
fn main() {
match 0u8 {
m::unresolved => {} // OK
m::unresolved(..) => {} // OK
m::unresolved{..} => {} // OK
}
}