user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #7585 : Blei/rust/fix-circular-modules, r=huonw

Browse source 
Fixes #7276
This commit is contained in:
bors 2013-07-07 03:40:59 -07:00
commit d91ac39cd5
4 changed files with 60 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/test/compile-fail/circular_modules_hello.rs Normal file
View file

@ -0,0 +1,17 @@
// Copyright 2013 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.
// xfail-test: this is an auxiliary file for circular-modules-main.rs
mod circular_modules_main;
pub fn say_hello() {
println(circular_modules_main::hi_str());
}

20
src/test/compile-fail/circular_modules_main.rs Normal file
View file

@ -0,0 +1,20 @@
// Copyright 2013 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.
mod circular_modules_hello; //~ERROR: circular modules
pub fn hi_str() -> ~str {
~"Hi!"
}
fn main() {
circular_modules_hello::say_hello();
}