Skip to content

Commit

Permalink
Rollup merge of rust-lang#36882 - jseyfried:fix_36881, r=eddyb
Browse files Browse the repository at this point in the history
resolve: fix incorrect code in `module_to_string`

Fixes rust-lang#36881.
r? @nrc or @eddyb
  • Loading branch information
Manishearth authored Oct 1, 2016
2 parents 987aea5 + 91e1f24 commit 8457ab6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc_resolve/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3534,7 +3534,7 @@ fn module_to_string(module: Module) -> String {
} else {
// danger, shouldn't be ident?
names.push(token::intern("<opaque>"));
collect_mod(names, module);
collect_mod(names, module.parent.unwrap());
}
}
collect_mod(&mut names, module);
Expand Down
14 changes: 14 additions & 0 deletions src/test/compile-fail/issue-36881.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// 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.

fn main() {
extern crate rand;
use rand::Rng; //~ ERROR unresolved import
}

0 comments on commit 8457ab6

Please sign in to comment.