diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2012-09-21 18:10:45 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2012-09-21 18:11:43 -0700 |
| commit | dffe188991325b4e803fdd0da7c1563ce0fa27f4 (patch) | |
| tree | e8f65929b804a38550dc9fdcf24021e6a7920304 /src/test/compile-fail | |
| parent | 60443d48881bfbc7a305e807390e74b327f100b8 (diff) | |
| download | rust-dffe188991325b4e803fdd0da7c1563ce0fa27f4.tar.gz rust-dffe188991325b4e803fdd0da7c1563ce0fa27f4.zip | |
Install new pub/priv/export rules as defaults, old rules accessible under #[legacy_exports];
Diffstat (limited to 'src/test/compile-fail')
48 files changed, 68 insertions, 7 deletions
diff --git a/src/test/compile-fail/attr-bad-meta.rs b/src/test/compile-fail/attr-bad-meta.rs index 6b074d736cd..6d7ffae620c 100644 --- a/src/test/compile-fail/attr-bad-meta.rs +++ b/src/test/compile-fail/attr-bad-meta.rs @@ -2,4 +2,5 @@ // asterisk is bogus #[attr*] -mod m { } +mod m { + #[legacy_exports]; } diff --git a/src/test/compile-fail/bad-expr-path.rs b/src/test/compile-fail/bad-expr-path.rs index 62fc81649ff..e38ca8443bc 100644 --- a/src/test/compile-fail/bad-expr-path.rs +++ b/src/test/compile-fail/bad-expr-path.rs @@ -1,5 +1,6 @@ // error-pattern: unresolved name: m1::a -mod m1 { } +mod m1 { + #[legacy_exports]; } fn main(args: ~[str]) { log(debug, m1::a); } diff --git a/src/test/compile-fail/bad-expr-path2.rs b/src/test/compile-fail/bad-expr-path2.rs index fe2501b29f7..a7f23df1c66 100644 --- a/src/test/compile-fail/bad-expr-path2.rs +++ b/src/test/compile-fail/bad-expr-path2.rs @@ -1,7 +1,9 @@ // error-pattern: unresolved name: m1::a mod m1 { - mod a { } + #[legacy_exports]; + mod a { + #[legacy_exports]; } } fn main(args: ~[str]) { log(debug, m1::a); } diff --git a/src/test/compile-fail/crateresolve2.rs b/src/test/compile-fail/crateresolve2.rs index 9f23d30fdde..91b2c95b8a7 100644 --- a/src/test/compile-fail/crateresolve2.rs +++ b/src/test/compile-fail/crateresolve2.rs @@ -6,6 +6,7 @@ extern mod crateresolve2(vers = "0.1"); mod m { + #[legacy_exports]; extern mod crateresolve2(vers = "0.2"); } diff --git a/src/test/compile-fail/empty-linkname.rs b/src/test/compile-fail/empty-linkname.rs index 0b6cd08d6bc..c9f2775329c 100644 --- a/src/test/compile-fail/empty-linkname.rs +++ b/src/test/compile-fail/empty-linkname.rs @@ -2,4 +2,5 @@ #[link_name = ""] extern mod foo { + #[legacy_exports]; } diff --git a/src/test/compile-fail/empty-linkname2.rs b/src/test/compile-fail/empty-linkname2.rs index 2c87c7308e2..faf283ef4a1 100644 --- a/src/test/compile-fail/empty-linkname2.rs +++ b/src/test/compile-fail/empty-linkname2.rs @@ -4,4 +4,5 @@ #[link_name = ""] #[nolink] extern mod foo { + #[legacy_exports]; } diff --git a/src/test/compile-fail/export-fully-qualified.rs b/src/test/compile-fail/export-fully-qualified.rs index 30075a1cadb..5a711ff95bd 100644 --- a/src/test/compile-fail/export-fully-qualified.rs +++ b/src/test/compile-fail/export-fully-qualified.rs @@ -5,6 +5,7 @@ // want to change eventually. mod foo { + #[legacy_exports]; export bar; diff --git a/src/test/compile-fail/export-import.rs b/src/test/compile-fail/export-import.rs index 6c9f8d15698..c6a9d3c0528 100644 --- a/src/test/compile-fail/export-import.rs +++ b/src/test/compile-fail/export-import.rs @@ -3,6 +3,7 @@ use m::unexported; mod m { + #[legacy_exports]; export exported; fn exported() { } diff --git a/src/test/compile-fail/export-tag-variant.rs b/src/test/compile-fail/export-tag-variant.rs index 7f0d7a90d38..ceedf719dd3 100644 --- a/src/test/compile-fail/export-tag-variant.rs +++ b/src/test/compile-fail/export-tag-variant.rs @@ -1,6 +1,7 @@ // error-pattern: unresolved name mod foo { + #[legacy_exports]; export x; fn x() { } diff --git a/src/test/compile-fail/export.rs b/src/test/compile-fail/export.rs index bda344587d9..69485a0ead5 100644 --- a/src/test/compile-fail/export.rs +++ b/src/test/compile-fail/export.rs @@ -1,5 +1,6 @@ // error-pattern: unresolved name mod foo { + #[legacy_exports]; export x; fn x(y: int) { log(debug, y); } fn z(y: int) { log(debug, y); } diff --git a/src/test/compile-fail/export2.rs b/src/test/compile-fail/export2.rs index cc2fcf31e9e..b1912397f4c 100644 --- a/src/test/compile-fail/export2.rs +++ b/src/test/compile-fail/export2.rs @@ -1,12 +1,14 @@ // error-pattern: unresolved name mod foo { + #[legacy_exports]; export x; fn x() { bar::x(); } } mod bar { + #[legacy_exports]; export y; fn x() { debug!("x"); } diff --git a/src/test/compile-fail/foreign-unsafe-fn-called.rs b/src/test/compile-fail/foreign-unsafe-fn-called.rs index c5c80d3a852..db1d3195eec 100644 --- a/src/test/compile-fail/foreign-unsafe-fn-called.rs +++ b/src/test/compile-fail/foreign-unsafe-fn-called.rs @@ -2,6 +2,7 @@ #[abi = "cdecl"] extern mod test { + #[legacy_exports]; unsafe fn free(); } diff --git a/src/test/compile-fail/foreign-unsafe-fn.rs b/src/test/compile-fail/foreign-unsafe-fn.rs index f0619e107bd..03c16199843 100644 --- a/src/test/compile-fail/foreign-unsafe-fn.rs +++ b/src/test/compile-fail/foreign-unsafe-fn.rs @@ -2,6 +2,7 @@ #[abi = "cdecl"] extern mod test { + #[legacy_exports]; unsafe fn free(); } diff --git a/src/test/compile-fail/fully-qualified-type-name2.rs b/src/test/compile-fail/fully-qualified-type-name2.rs index 12125422a94..454e7012d37 100644 --- a/src/test/compile-fail/fully-qualified-type-name2.rs +++ b/src/test/compile-fail/fully-qualified-type-name2.rs @@ -1,10 +1,12 @@ // Test that we use fully-qualified type names in error messages. mod x { + #[legacy_exports]; enum foo { } } mod y { + #[legacy_exports]; enum foo { } } diff --git a/src/test/compile-fail/import-from-missing.rs b/src/test/compile-fail/import-from-missing.rs index bd3a35ad280..9b408100eee 100644 --- a/src/test/compile-fail/import-from-missing.rs +++ b/src/test/compile-fail/import-from-missing.rs @@ -3,6 +3,7 @@ use spam::{ham, eggs}; mod spam { + #[legacy_exports]; fn ham() { } } diff --git a/src/test/compile-fail/import-from-rename.rs b/src/test/compile-fail/import-from-rename.rs index c72d9fda4e5..bbcb6e47882 100644 --- a/src/test/compile-fail/import-from-rename.rs +++ b/src/test/compile-fail/import-from-rename.rs @@ -3,6 +3,7 @@ use baz = foo::{bar}; mod foo { + #[legacy_exports]; fn bar() {} } diff --git a/src/test/compile-fail/import-glob-0.rs b/src/test/compile-fail/import-glob-0.rs index e9b485e4c6c..7ce73b7787f 100644 --- a/src/test/compile-fail/import-glob-0.rs +++ b/src/test/compile-fail/import-glob-0.rs @@ -3,6 +3,7 @@ use module_of_many_things::*; mod module_of_many_things { + #[legacy_exports]; export f1; export f2; export f4; diff --git a/src/test/compile-fail/import-glob-circular.rs b/src/test/compile-fail/import-glob-circular.rs index a3847c989d1..091b1e783b7 100644 --- a/src/test/compile-fail/import-glob-circular.rs +++ b/src/test/compile-fail/import-glob-circular.rs @@ -1,6 +1,7 @@ // error-pattern: unresolved mod circ1 { + #[legacy_exports]; use circ1::*; export f1; export f2; @@ -10,6 +11,7 @@ mod circ1 { } mod circ2 { + #[legacy_exports]; use circ2::*; export f1; export f2; @@ -19,6 +21,7 @@ mod circ2 { } mod test { + #[legacy_exports]; use circ1::*; fn test() { f1066(); } diff --git a/src/test/compile-fail/import-glob-export.rs b/src/test/compile-fail/import-glob-export.rs index 067caab3542..4e62df3cc00 100644 --- a/src/test/compile-fail/import-glob-export.rs +++ b/src/test/compile-fail/import-glob-export.rs @@ -4,6 +4,7 @@ use m1::*; mod m1 { + #[legacy_exports]; export f1; fn f1() { } fn f2() { } diff --git a/src/test/compile-fail/import-glob-rename.rs b/src/test/compile-fail/import-glob-rename.rs index 3fd927d7e64..24fe3fd74b9 100644 --- a/src/test/compile-fail/import-glob-rename.rs +++ b/src/test/compile-fail/import-glob-rename.rs @@ -3,6 +3,7 @@ use baz = foo::*; mod foo { + #[legacy_exports]; fn bar() {} } diff --git a/src/test/compile-fail/import-loop-2.rs b/src/test/compile-fail/import-loop-2.rs index 7cedd8a9c41..6a4d31c2ef3 100644 --- a/src/test/compile-fail/import-loop-2.rs +++ b/src/test/compile-fail/import-loop-2.rs @@ -1,11 +1,13 @@ // error-pattern:import mod a { + #[legacy_exports]; import b::x; export x; } mod b { + #[legacy_exports]; import a::x; export x; diff --git a/src/test/compile-fail/import-loop.rs b/src/test/compile-fail/import-loop.rs index 0b263f23087..11745f302bf 100644 --- a/src/test/compile-fail/import-loop.rs +++ b/src/test/compile-fail/import-loop.rs @@ -3,6 +3,7 @@ use y::x; mod y { + #[legacy_exports]; import x; export x; } diff --git a/src/test/compile-fail/import.rs b/src/test/compile-fail/import.rs index 14f23dec5f3..6863d2b1a7a 100644 --- a/src/test/compile-fail/import.rs +++ b/src/test/compile-fail/import.rs @@ -3,6 +3,7 @@ use zed::bar; use zed::baz; mod zed { + #[legacy_exports]; fn bar() { debug!("bar"); } } fn main(args: ~[str]) { bar(); } diff --git a/src/test/compile-fail/import2.rs b/src/test/compile-fail/import2.rs index ab9ea6b26df..7b1f258a9db 100644 --- a/src/test/compile-fail/import2.rs +++ b/src/test/compile-fail/import2.rs @@ -1,7 +1,9 @@ // error-pattern: unresolved use baz::zed::bar; -mod baz { } +mod baz { + #[legacy_exports]; } mod zed { + #[legacy_exports]; fn bar() { debug!("bar3"); } } fn main(args: ~[str]) { bar(); } diff --git a/src/test/compile-fail/import4.rs b/src/test/compile-fail/import4.rs index 6717434273f..22068f1badf 100644 --- a/src/test/compile-fail/import4.rs +++ b/src/test/compile-fail/import4.rs @@ -1,6 +1,8 @@ // error-pattern: import -mod a { import foo = b::foo; export foo; } -mod b { import foo = a::foo; export foo; } +mod a { + #[legacy_exports]; import foo = b::foo; export foo; } +mod b { + #[legacy_exports]; import foo = a::foo; export foo; } fn main(args: ~[str]) { debug!("loop"); } diff --git a/src/test/compile-fail/issue-1193.rs b/src/test/compile-fail/issue-1193.rs index e9a5d91c9d2..ba21c995adb 100644 --- a/src/test/compile-fail/issue-1193.rs +++ b/src/test/compile-fail/issue-1193.rs @@ -1,5 +1,6 @@ // error-pattern: pattern variable conflicts mod foo { + #[legacy_exports]; type t = u8; const a : t = 0u8; diff --git a/src/test/compile-fail/issue-1655.rs b/src/test/compile-fail/issue-1655.rs index bfaca3155f8..91a3c3f25c0 100644 --- a/src/test/compile-fail/issue-1655.rs +++ b/src/test/compile-fail/issue-1655.rs @@ -1,5 +1,6 @@ // error-pattern:expected item mod blade_runner { + #[legacy_exports]; #~[doc( brief = "Blade Runner is probably the best movie ever", desc = "I like that in the world of Blade Runner it is always diff --git a/src/test/compile-fail/issue-2123.rs b/src/test/compile-fail/issue-2123.rs index 843fd2b14eb..4912433c2ad 100644 --- a/src/test/compile-fail/issue-2123.rs +++ b/src/test/compile-fail/issue-2123.rs @@ -3,6 +3,7 @@ use x = m::f; mod m { + #[legacy_exports]; } fn main() { diff --git a/src/test/compile-fail/issue-2718-a.rs b/src/test/compile-fail/issue-2718-a.rs index b857af4e2f3..fa519453ca2 100644 --- a/src/test/compile-fail/issue-2718-a.rs +++ b/src/test/compile-fail/issue-2718-a.rs @@ -4,6 +4,7 @@ struct send_packet<T: Copy> { mod pingpong { + #[legacy_exports]; type ping = send_packet<pong>; enum pong = send_packet<ping>; //~ ERROR illegal recursive enum type; wrap the inner value in a box to make it representable } diff --git a/src/test/compile-fail/issue-2766-a.rs b/src/test/compile-fail/issue-2766-a.rs index 78225ba15ec..28042e77a5e 100644 --- a/src/test/compile-fail/issue-2766-a.rs +++ b/src/test/compile-fail/issue-2766-a.rs @@ -1,6 +1,8 @@ mod stream { + #[legacy_exports]; enum stream<T: Send> { send(T, server::stream<T>), } mod server { + #[legacy_exports]; impl<T: Send> stream<T> { fn recv() -> extern fn(+stream<T>) -> stream::stream<T> { // resolve really should report just one error here. diff --git a/src/test/compile-fail/issue-2848.rs b/src/test/compile-fail/issue-2848.rs index b091dc71357..689b8240140 100644 --- a/src/test/compile-fail/issue-2848.rs +++ b/src/test/compile-fail/issue-2848.rs @@ -1,4 +1,5 @@ mod bar { + #[legacy_exports]; enum foo { alpha, beta, diff --git a/src/test/compile-fail/issue-2937.rs b/src/test/compile-fail/issue-2937.rs index c923d1d2dbe..85ba4c2eabf 100644 --- a/src/test/compile-fail/issue-2937.rs +++ b/src/test/compile-fail/issue-2937.rs @@ -2,6 +2,7 @@ use x = m::f; mod m { + #[legacy_exports]; } fn main() { diff --git a/src/test/compile-fail/issue-3099-b.rs b/src/test/compile-fail/issue-3099-b.rs index 307c629d51f..997bb9e2557 100644 --- a/src/test/compile-fail/issue-3099-b.rs +++ b/src/test/compile-fail/issue-3099-b.rs @@ -1,5 +1,7 @@ +#[legacy_exports] mod a {} +#[legacy_exports] mod a {} //~ ERROR Duplicate definition of module a fn main() {} diff --git a/src/test/compile-fail/keyword.rs b/src/test/compile-fail/keyword.rs index 02d0b089199..e39046fa9f7 100644 --- a/src/test/compile-fail/keyword.rs +++ b/src/test/compile-fail/keyword.rs @@ -1,3 +1,4 @@ +#[legacy_exports] mod break { //~^ ERROR found `break` in ident position } \ No newline at end of file diff --git a/src/test/compile-fail/nolink-with-link-args.rs b/src/test/compile-fail/nolink-with-link-args.rs index 713c8033a0e..d17aed4d5a7 100644 --- a/src/test/compile-fail/nolink-with-link-args.rs +++ b/src/test/compile-fail/nolink-with-link-args.rs @@ -6,6 +6,7 @@ the compiler output. */ #[link_args = "aFdEfSeVEEE"] #[nolink] -extern mod m1 { } +extern mod m1 { + #[legacy_exports]; } fn main() { } \ No newline at end of file diff --git a/src/test/compile-fail/private-impl-method.rs b/src/test/compile-fail/private-impl-method.rs index 2d6047b3647..a94bc37e132 100644 --- a/src/test/compile-fail/private-impl-method.rs +++ b/src/test/compile-fail/private-impl-method.rs @@ -1,4 +1,5 @@ mod a { + #[legacy_exports]; struct Foo { x: int } diff --git a/src/test/compile-fail/private-item-simple.rs b/src/test/compile-fail/private-item-simple.rs index 305899799fd..b39c51c1846 100644 --- a/src/test/compile-fail/private-item-simple.rs +++ b/src/test/compile-fail/private-item-simple.rs @@ -1,4 +1,5 @@ mod a { + #[legacy_exports]; priv fn f() {} } diff --git a/src/test/compile-fail/private-method.rs b/src/test/compile-fail/private-method.rs index 0f489a7dc76..0b4dd71da64 100644 --- a/src/test/compile-fail/private-method.rs +++ b/src/test/compile-fail/private-method.rs @@ -1,6 +1,7 @@ // error-pattern:method `nap` is private mod kitties { + #[legacy_exports]; struct cat { priv mut meows : uint, diff --git a/src/test/compile-fail/private-struct-field-ctor.rs b/src/test/compile-fail/private-struct-field-ctor.rs index 6d075cbd7ad..a766a7ed66a 100644 --- a/src/test/compile-fail/private-struct-field-ctor.rs +++ b/src/test/compile-fail/private-struct-field-ctor.rs @@ -1,4 +1,5 @@ mod a { + #[legacy_exports]; struct Foo { priv x: int } diff --git a/src/test/compile-fail/private-struct-field-pattern.rs b/src/test/compile-fail/private-struct-field-pattern.rs index cc3ebc92172..4ab5934c287 100644 --- a/src/test/compile-fail/private-struct-field-pattern.rs +++ b/src/test/compile-fail/private-struct-field-pattern.rs @@ -1,6 +1,7 @@ use a::Foo; mod a { + #[legacy_exports]; struct Foo { priv x: int } diff --git a/src/test/compile-fail/private-struct-field.rs b/src/test/compile-fail/private-struct-field.rs index 5dffdfa4fd1..1ec9ffcd306 100644 --- a/src/test/compile-fail/private-struct-field.rs +++ b/src/test/compile-fail/private-struct-field.rs @@ -1,4 +1,5 @@ mod cat { + #[legacy_exports]; struct Cat { priv meows: uint } diff --git a/src/test/compile-fail/private-variant.rs b/src/test/compile-fail/private-variant.rs index 2b31b550e24..12d2ee401ef 100644 --- a/src/test/compile-fail/private-variant.rs +++ b/src/test/compile-fail/private-variant.rs @@ -1,4 +1,5 @@ mod a { + #[legacy_exports]; enum Waffle { Belgian, Brussels, diff --git a/src/test/compile-fail/redundant-link-args.rs b/src/test/compile-fail/redundant-link-args.rs index 6a316886fe0..88d0e4a53ee 100644 --- a/src/test/compile-fail/redundant-link-args.rs +++ b/src/test/compile-fail/redundant-link-args.rs @@ -9,9 +9,11 @@ #[link_name= "m"] #[link_args="-foo"] // this could have been elided. extern mod m1 { + #[legacy_exports]; } #[link_name= "m"] #[link_args="-bar"] // this is the actual error trigger. extern mod m2 { + #[legacy_exports]; } diff --git a/src/test/compile-fail/regions-glb-free-free.rs b/src/test/compile-fail/regions-glb-free-free.rs index d7f6d42c74e..223665381da 100644 --- a/src/test/compile-fail/regions-glb-free-free.rs +++ b/src/test/compile-fail/regions-glb-free-free.rs @@ -1,4 +1,5 @@ mod argparse { + #[legacy_exports]; extern mod std; use either::{Either, Left, Right}; diff --git a/src/test/compile-fail/unused-imports-warn.rs b/src/test/compile-fail/unused-imports-warn.rs index da1fb692c06..24f423400aa 100644 --- a/src/test/compile-fail/unused-imports-warn.rs +++ b/src/test/compile-fail/unused-imports-warn.rs @@ -3,12 +3,15 @@ use cal = bar::c::cc; mod foo { + #[legacy_exports]; type point = {x: int, y: int}; type square = {p: point, h: uint, w: uint}; } mod bar { + #[legacy_exports]; mod c { + #[legacy_exports]; use foo::point; use foo::square; fn cc(p: point) -> str { return 2 * (p.x + p.y); } diff --git a/src/test/compile-fail/warn-ctypes-err-attr.rs b/src/test/compile-fail/warn-ctypes-err-attr.rs index de2849a78de..8c8bcd58a4f 100644 --- a/src/test/compile-fail/warn-ctypes-err-attr.rs +++ b/src/test/compile-fail/warn-ctypes-err-attr.rs @@ -3,6 +3,7 @@ #[nolink] extern mod libc { + #[legacy_exports]; fn malloc(size: int) -> *u8; } diff --git a/src/test/compile-fail/warn-ctypes.rs b/src/test/compile-fail/warn-ctypes.rs index 1bf05b4c190..76b18e7094c 100644 --- a/src/test/compile-fail/warn-ctypes.rs +++ b/src/test/compile-fail/warn-ctypes.rs @@ -2,6 +2,7 @@ // error-pattern:found rust type #[nolink] extern mod libc { + #[legacy_exports]; fn malloc(size: int) -> *u8; } diff --git a/src/test/compile-fail/warn-foreign-int-types.rs b/src/test/compile-fail/warn-foreign-int-types.rs index 4ff7d0edf05..8322a25543e 100644 --- a/src/test/compile-fail/warn-foreign-int-types.rs +++ b/src/test/compile-fail/warn-foreign-int-types.rs @@ -1,5 +1,6 @@ //error-pattern:libc::c_int or libc::c_long should be used extern mod xx { + #[legacy_exports]; fn strlen(str: *u8) -> uint; fn foo(x: int, y: uint); } |
