diff options
| author | bors <bors@rust-lang.org> | 2013-06-25 13:11:11 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-25 13:11:11 -0700 |
| commit | 4967bd0508a4d04797e0fff49517b7abbc086b74 (patch) | |
| tree | 836eb9cd378ba3a0521fc62327226ab772425bb3 /src/test | |
| parent | 032dcc57e8876e960837c3a050be2c7570e7eafd (diff) | |
| parent | f982f42f3c1c45ed1be4c0fd5a90e639e43e3f95 (diff) | |
auto merge of #7325 : artagnon/rust/resolve-module, r=cmr
Fix #7322. I started out with a band-aid approach to special-case the duplicate module error using `is_duplicate_module`, but thought this would be better in the long term.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/issue-3099-b.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/compile-fail/issue-3099-b.rs b/src/test/compile-fail/issue-3099-b.rs index 3d22a59d6bd..5502b18f094 100644 --- a/src/test/compile-fail/issue-3099-b.rs +++ b/src/test/compile-fail/issue-3099-b.rs @@ -10,6 +10,6 @@ pub mod a {} -pub mod a {} //~ ERROR duplicate definition of type `a` +pub mod a {} //~ ERROR duplicate definition of module `a` fn main() {} |