bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc_resolve: don't record uniform_paths canaries as reexports.

Browse source
This commit is contained in:
Eduard-Mihai Burtescu 2018-09-06 15:04:21 +03:00
parent 27e5457f3f
commit c34dd37f85
3 changed files with 46 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_resolve/resolve_imports.rs
View file

@ -1155,7 +1155,15 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
None => continue,
};
if binding.is_import() || binding.is_macro_def() {
// Don't reexport `uniform_path` canaries.
let non_canary_import = match binding.kind {
NameBindingKind::Import { directive, .. } => {
!directive.is_uniform_paths_canary
}
_ => false,
};
if non_canary_import || binding.is_macro_def() {
let def = binding.def();
if def != Def::Err {
if !def.def_id().is_local() {

19
src/test/run-pass/uniform-paths/auxiliary/issue-53691.rs Normal file
View file

@ -0,0 +1,19 @@
// Copyright 2018 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.
// edition:2018
#![feature(uniform_paths)]
mod m { pub fn f() {} }
mod n { pub fn g() {} }
pub use m::f;
pub use n::g;

18
src/test/run-pass/uniform-paths/issue-53691.rs Normal file
View file

@ -0,0 +1,18 @@
// Copyright 2018 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.
// aux-build:issue-53691.rs
extern crate issue_53691;
fn main() {
issue_53691::f();
issue_53691::g();
}