languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-07-20 04:25:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rollup merge of #34542 - jseyfried:fix_recursive_modules, r=nrc

Browse source 
Fix non-termination on recursive module re-exports in extern crates

Fixes #33776.
r? @nrc
This commit is contained in:
Manish Goregaokar 2016-06-29 21:21:24 +05:30 committed by GitHub
parent cc15c211c5 9ffe1c9fba
commit 8e2598c3d2
3 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_resolve/lib.rs
View file

@ -3207,7 +3207,9 @@ fn lookup_candidates<FilterFn>(&mut self,
if !in_module_is_extern || name_binding.vis == ty::Visibility::Public {
// add the module to the lookup
let is_extern = in_module_is_extern || name_binding.is_extern_crate();
worklist.push((module, path_segments, is_extern));
if !worklist.iter().any(|&(m, _, _)| m.def == module.def) {
worklist.push((module, path_segments, is_extern));
}
}
}
})

13
src/test/compile-fail/auxiliary/recursive_reexports.rs Normal file
View file

@ -0,0 +1,13 @@
// 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.
pub mod foo {
pub use foo;
}

15
src/test/compile-fail/recursive-reexports.rs Normal file
View file

@ -0,0 +1,15 @@
// 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.
// aux-build:recursive_reexports.rs
fn f() -> recursive_reexports::S {} //~ ERROR undeclared
fn main() {}