test: Remove export from the tests, language, and libraries. rs=deexporting

src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs

@@ -10,9 +10,9 @@
 
 #[link(name = "crate_method_reexport_grrrrrrr2")];
 
-use name_pool::add;
+pub use name_pool::add;
 
-mod name_pool {
+pub mod name_pool {
     pub type name_pool = ();
 
     pub trait add {
@@ -26,7 +26,7 @@ fn add(s: ~str) {
 }
 
 pub mod rust {
-    use name_pool::add;
+    pub use name_pool::add;
 
     pub type rt = @();
 

src/test/run-pass/alt-path.rs

@@ -11,8 +11,7 @@
 
 
 mod m1 {
-    #[legacy_exports];
-    enum foo { foo1, foo2, }
+    pub enum foo { foo1, foo2, }
 }
 
 fn bar(x: m1::foo) { match x { m1::foo1 => { } m1::foo2 => { } } }

src/test/run-pass/attr-before-view-item2.rs

@@ -11,7 +11,6 @@
 // error-pattern:expected item
 
 mod m {
-    #[legacy_exports];
     #[foo = "bar"]
     extern mod std;
 }

src/test/run-pass/binops.rs

@@ -82,9 +82,8 @@ fn test_ptr() {
 #[abi = "cdecl"]
 #[nolink]
 extern mod test {
-    #[legacy_exports];
-    fn rust_get_sched_id() -> libc::intptr_t;
-    fn get_task_id() -> libc::intptr_t;
+    pub fn rust_get_sched_id() -> libc::intptr_t;
+    pub fn get_task_id() -> libc::intptr_t;
 }
 
 struct p {

src/test/run-pass/c-stack-as-value.rs

@@ -10,8 +10,7 @@
 
 #[abi = "cdecl"]
 extern mod rustrt {
-    #[legacy_exports];
-    fn get_task_id() -> libc::intptr_t;
+    pub fn get_task_id() -> libc::intptr_t;
 }
 
 fn main() {

src/test/run-pass/c-stack-returning-int64.rs

@@ -13,9 +13,8 @@
 #[abi = "cdecl"]
 #[nolink]
 extern mod libc {
-    #[legacy_exports];
-    fn atol(x: *u8) -> int;
-    fn atoll(x: *u8) -> i64;
+    pub fn atol(x: *u8) -> int;
+    pub fn atoll(x: *u8) -> i64;
 }
 
 fn atol(s: ~str) -> int {

src/test/run-pass/cci_borrow.rs

@@ -11,12 +11,10 @@
 // xfail-fast - check-fast doesn't understand aux-build
 // aux-build:cci_borrow_lib.rs
 
-#[legacy_exports];
-
 extern mod cci_borrow_lib;
 use cci_borrow_lib::foo;
 
-fn main() {
+pub fn main() {
     let p = @22u;
     let r = foo(p);
     debug!("r=%u", r);

src/test/run-pass/cci_capture_clause.rs

@@ -14,10 +14,8 @@
 // This test makes sure we can do cross-crate inlining on functions
 // that use capture clauses.
 
-#[legacy_exports];
-
 extern mod cci_capture_clause;
 
-fn main() {
+pub fn main() {
     cci_capture_clause::foo(()).recv()
 }

src/test/run-pass/cci_nested_exe.rs

@@ -11,13 +11,10 @@
 // xfail-fast - check-fast doesn't understand aux-build
 // aux-build:cci_nested_lib.rs
 
-#[legacy_modes];
-#[legacy_exports];
-
 extern mod cci_nested_lib;
 use cci_nested_lib::*;
 
-fn main() {
+pub fn main() {
     let lst = new_int_alist();
     alist_add(lst, 22, ~"hi");
     alist_add(lst, 44, ~"ho");

src/test/run-pass/cci_no_inline_exe.rs

@@ -11,12 +11,10 @@
 // xfail-fast - check-fast doesn't understand aux-build
 // aux-build:cci_no_inline_lib.rs
 
-#[legacy_exports];
-
 extern mod cci_no_inline_lib;
 use cci_no_inline_lib::iter;
 
-fn main() {
+pub fn main() {
     // Check that a cross-crate call function not marked as inline
     // does not, in fact, get inlined.  Also, perhaps more
     // importantly, checks that our scheme of using

src/test/run-pass/class-exports.rs

@@ -16,24 +16,21 @@
 use kitty::*;
 
 mod kitty {
-    #[legacy_exports];
-  export cat;
-  struct cat {
+    pub struct cat {
         meows: uint,
         name: ~str,
     }
 
-  impl cat {
+    pub impl cat {
         fn get_name() -> ~str { copy self.name }
     }
 
-    fn cat(in_name: ~str) -> cat {
+    pub fn cat(in_name: ~str) -> cat {
         cat {
             name: in_name,
             meows: 0u
         }
     }
-
 }
 
 fn main() {

src/test/run-pass/conditional-compile.rs

@@ -22,15 +22,13 @@
 #[cfg(bogus)]
 #[abi = "cdecl"]
 extern mod rustrt {
-    #[legacy_exports];
     // This symbol doesn't exist and would be a link error if this
     // module was translated
-    fn bogus();
+    pub fn bogus();
 }
 
 #[abi = "cdecl"]
-extern mod rustrt {
-    #[legacy_exports]; }
+extern mod rustrt {}
 
 #[cfg(bogus)]
 type t = int;
@@ -66,21 +64,18 @@ fn r(i:int) -> r {
 
 #[cfg(bogus)]
 mod m {
-    #[legacy_exports];
     // This needs to parse but would fail in typeck. Since it's not in
     // the current config it should not be typechecked.
-    fn bogus() { return 0; }
+    pub fn bogus() { return 0; }
 }
 
 mod m {
-    #[legacy_exports];
-
     // Submodules have slightly different code paths than the top-level
     // module, so let's make sure this jazz works here as well
     #[cfg(bogus)]
-    fn f() { }
+    pub fn f() { }
 
-    fn f() { }
+    pub fn f() { }
 }
 
 // Since the bogus configuration isn't defined main will just be
@@ -111,23 +106,19 @@ fn f() { }
 }
 
 mod test_foreign_items {
-    #[legacy_exports];
     #[abi = "cdecl"]
-    extern mod rustrt {
-        #[legacy_exports];
+    pub extern mod rustrt {
         #[cfg(bogus)]
-        fn rust_getcwd() -> ~str;
-        fn rust_getcwd() -> ~str;
+        pub fn rust_getcwd() -> ~str;
+        pub fn rust_getcwd() -> ~str;
     }
 }
 
 mod test_use_statements {
-    #[legacy_exports];
     #[cfg(bogus)]
     use flippity_foo;
 
-    extern mod rustrt {
-        #[legacy_exports];
+    pub extern mod rustrt {
         #[cfg(bogus)]
         use flippity_foo;
     }

src/test/run-pass/crateresolve2.rs

@@ -14,21 +14,18 @@
 // aux-build:crateresolve2-3.rs
 
 mod a {
-    #[legacy_exports];
     extern mod crateresolve2(vers = "0.1");
-    fn f() { assert crateresolve2::f() == 10; }
+    pub fn f() { assert crateresolve2::f() == 10; }
 }
 
 mod b {
-    #[legacy_exports];
     extern mod crateresolve2(vers = "0.2");
-    fn f() { assert crateresolve2::f() == 20; }
+    pub fn f() { assert crateresolve2::f() == 20; }
 }
 
 mod c {
-    #[legacy_exports];
     extern mod crateresolve2(vers = "0.3");
-    fn f() { assert crateresolve2::f() == 30; }
+    pub fn f() { assert crateresolve2::f() == 30; }
 }
 
 fn main() {

src/test/run-pass/crateresolve3.rs

@@ -16,15 +16,13 @@
 // as long as no name collision on invoked functions.
 
 mod a {
-    #[legacy_exports];
     extern mod crateresolve3(vers = "0.1");
-    fn f() { assert crateresolve3::f() == 10; }
+    pub fn f() { assert crateresolve3::f() == 10; }
 }
 
 mod b {
-    #[legacy_exports];
     extern mod crateresolve3(vers = "0.2");
-    fn f() { assert crateresolve3::g() == 20; }
+    pub fn f() { assert crateresolve3::g() == 20; }
 }
 
 fn main() {

src/test/run-pass/crateresolve4.rs

@@ -14,21 +14,17 @@
 // aux-build:crateresolve4b-1.rs
 // aux-build:crateresolve4b-2.rs
 
-#[legacy_exports];
-
-mod a {
-    #[legacy_exports];
+pub mod a {
     extern mod crateresolve4b(vers = "0.1");
-    fn f() { assert crateresolve4b::f() == 20; }
+    pub fn f() { assert crateresolve4b::f() == 20; }
 }
 
-mod b {
-    #[legacy_exports];
+pub mod b {
     extern mod crateresolve4b(vers = "0.2");
-    fn f() { assert crateresolve4b::g() == 10; }
+    pub fn f() { assert crateresolve4b::g() == 10; }
 }
 
-fn main() {
+pub fn main() {
     a::f();
     b::f();
 }

src/test/run-pass/export-abstract-tag.rs

@@ -12,13 +12,9 @@
 // sort of ADT.
 
 mod foo {
-    #[legacy_exports];
-    export t;
-    export f;
+    pub enum t { t1, }
 
-    enum t { t1, }
-
-    fn f() -> t { return t1; }
+    pub fn f() -> t { return t1; }
 }
 
 fn main() { let v: foo::t = foo::f(); }

src/test/run-pass/export-glob-imports-target.rs

@@ -16,13 +16,11 @@
 // Modified to not use export since it's going away. --pcw
 
 mod foo {
-    #[legacy_exports];
     use foo::bar::*;
-    mod bar {
-        #[legacy_exports];
-        const a : int = 10;
+    pub mod bar {
+        pub const a : int = 10;
     }
-    fn zum() {
+    pub fn zum() {
         let b = a;
     }
 }

src/test/run-pass/export-glob.rs

-// xfail-fast
-
-// Copyright 2012 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.
-
-// Test that a glob-export functions as an explicit
-// named export when referenced from outside its scope.
-
-// Modified to not use export since it's going away. --pcw
-
-mod foo {
-    #[legacy_exports];
-    use foo::bar::*;
-    export a;
-    export bar;
-    mod bar {
-        #[legacy_exports];
-        const a : int = 10;
-    }
-}
-
-fn main() { let v = foo::a; }

src/test/run-pass/export-multi.rs

@@ -14,11 +14,8 @@
 use m::g;
 
 mod m {
-    #[legacy_exports];
-    export f, g;
-
-    fn f() { }
-    fn g() { }
+    pub fn f() { }
+    pub fn g() { }
 }
 
 fn main() { f(); g(); m::f(); m::g(); }

src/test/run-pass/export-non-interference.rs

@@ -9,9 +9,6 @@
 // except according to those terms.
 
 
-export foo;
-export main;
-
 enum list_cell<T> { cons(@list_cell<T>), nil }
 
-fn main() { }
+pub fn main() { }

src/test/run-pass/export-tag-variant.rs

@@ -8,12 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Export the enum variants, without the enum
-
 mod foo {
-    #[legacy_exports];
-    export t1;
-    enum t { t1, }
+    pub enum t { t1, }
 }
 
 fn main() { let v = foo::t1; }

src/test/run-pass/export-unexported-dep.rs

@@ -12,10 +12,6 @@
 // that are not exported, allowing for a sort of poor-man's ADT
 
 mod foo {
-    #[legacy_exports];
-    export f;
-    export g;
-
     // not exported
     enum t { t1, t2, }
 
@@ -26,9 +22,9 @@ impl t : cmp::Eq {
         pure fn ne(&self, other: &t) -> bool { !(*self).eq(other) }
     }
 
-    fn f() -> t { return t1; }
+    pub fn f() -> t { return t1; }
 
-    fn g(v: t) { assert (v == t1); }
+    pub fn g(v: t) { assert (v == t1); }
 }
 
 fn main() { foo::g(foo::f()); }

src/test/run-pass/expr-scope.rs

@@ -11,7 +11,5 @@
 // Regression test for issue #762
 // xfail-fast
 
-#[legacy_exports];
-
-fn f() { }
+pub fn f() { }
 fn main() { return ::f(); }

src/test/run-pass/extern-call-deep.rs

@@ -9,8 +9,7 @@
 // except according to those terms.
 
 extern mod rustrt {
-    #[legacy_exports];
-    fn rust_dbg_call(cb: *u8,
+    pub fn rust_dbg_call(cb: *u8,
                          data: libc::uintptr_t) -> libc::uintptr_t;
 }
 

src/test/run-pass/extern-call-deep2.rs

@@ -9,8 +9,7 @@
 // except according to those terms.
 
 extern mod rustrt {
-    #[legacy_exports];
-    fn rust_dbg_call(cb: *u8,
+    pub fn rust_dbg_call(cb: *u8,
                          data: libc::uintptr_t) -> libc::uintptr_t;
 }
 

src/test/run-pass/extern-call-scrub.rs

@@ -13,8 +13,7 @@
 // directions
 
 extern mod rustrt {
-    #[legacy_exports];
-    fn rust_dbg_call(cb: *u8,
+    pub fn rust_dbg_call(cb: *u8,
                          data: libc::uintptr_t) -> libc::uintptr_t;
 }
 

src/test/run-pass/extern-call.rs

@@ -9,8 +9,7 @@
 // except according to those terms.
 
 extern mod rustrt {
-    #[legacy_exports];
-    fn rust_dbg_call(cb: *u8,
+    pub fn rust_dbg_call(cb: *u8,
                          data: libc::uintptr_t) -> libc::uintptr_t;
 }
 

src/test/run-pass/extern-stress.rs

@@ -12,8 +12,7 @@
 // while holding onto C stacks
 
 extern mod rustrt {
-    #[legacy_exports];
-    fn rust_dbg_call(cb: *u8,
+    pub fn rust_dbg_call(cb: *u8,
                          data: libc::uintptr_t) -> libc::uintptr_t;
 }
 

src/test/run-pass/extern-yield.rs

@@ -9,8 +9,7 @@
 // except according to those terms.
 
 extern mod rustrt {
-    #[legacy_exports];
-    fn rust_dbg_call(cb: *u8,
+    pub fn rust_dbg_call(cb: *u8,
                          data: libc::uintptr_t) -> libc::uintptr_t;
 }
 

src/test/run-pass/foreign-dupe.rs

@@ -14,15 +14,13 @@
 #[abi = "cdecl"]
 #[link_name = "rustrt"]
 extern mod rustrt1 {
-    #[legacy_exports];
-    fn last_os_error() -> ~str;
+    pub fn last_os_error() -> ~str;
 }
 
 #[abi = "cdecl"]
 #[link_name = "rustrt"]
 extern mod rustrt2 {
-    #[legacy_exports];
-    fn last_os_error() -> ~str;
+    pub fn last_os_error() -> ~str;
 }
 
 fn main() {

src/test/run-pass/foreign-fn-linkname.rs

@@ -14,9 +14,8 @@
 #[nolink]
 #[abi = "cdecl"]
 extern mod libc {
-    #[legacy_exports];
     #[link_name = "strlen"]
-    fn my_strlen(str: *u8) -> uint;
+    pub fn my_strlen(str: *u8) -> uint;
 }
 
 fn strlen(str: ~str) -> uint {

src/test/run-pass/foreign-lib-path.rs

@@ -16,8 +16,7 @@
 // wouthout providing a -L argument to the compiler, and that
 // will also be found successfully at runtime.
 extern mod WHATGOESHERE {
-    #[legacy_exports];
-    fn IDONTKNOW() -> u32;
+    pub fn IDONTKNOW() -> u32;
 }
 
 fn main() {

src/test/run-pass/foreign-mod-unused-const.rs

@@ -10,8 +10,7 @@
 
 #[nolink]
 extern mod foo {
-    #[legacy_exports];
-    const errno: int;
+    pub const errno: int;
 }
 
 fn main() {

src/test/run-pass/foreign-no-abi.rs

@@ -11,8 +11,7 @@
 // ABI is cdecl by default
 
 extern mod rustrt {
-    #[legacy_exports];
-    fn get_task_id() -> libc::intptr_t;
+    pub fn get_task_id() -> libc::intptr_t;
 }
 
 fn main() {

src/test/run-pass/foreign-struct.rs

@@ -15,8 +15,7 @@ enum void { }
 
 #[nolink]
 extern mod bindgen {
-    #[legacy_exports];
-    fn printf(++v: void);
+    pub fn printf(++v: void);
 }
 
 fn main() { }

src/test/run-pass/foreign2.rs

@@ -10,25 +10,21 @@
 
 #[abi = "cdecl"]
 #[nolink]
-extern mod bar {
-    #[legacy_exports]; }
+extern mod bar {}
 
 #[abi = "cdecl"]
 #[nolink]
-extern mod zed {
-    #[legacy_exports]; }
+extern mod zed {}
 
 #[abi = "cdecl"]
 #[nolink]
 extern mod libc {
-    #[legacy_exports];
-    fn write(fd: int, buf: *u8,
+    pub fn write(fd: int, buf: *u8,
                  count: ::core::libc::size_t) -> ::core::libc::ssize_t;
 }
 
 #[abi = "cdecl"]
 #[nolink]
-extern mod baz {
-    #[legacy_exports]; }
+extern mod baz {}
 
 fn main() { }

src/test/run-pass/generic-fn-twice.rs

@@ -13,8 +13,7 @@
 
 // -*- rust -*-
 mod foomod {
-    #[legacy_exports];
-    fn foo<T>() { }
+    pub fn foo<T>() { }
 }
 
 fn main() { foomod::foo::<int>(); foomod::foo::<int>(); }

src/test/run-pass/global-scope.rs

@@ -10,14 +10,11 @@
 
 // xfail-fast
 
-#[legacy_exports];
+pub fn f() -> int { return 1; }
 
-fn f() -> int { return 1; }
-
-mod foo {
-    #[legacy_exports];
-    fn f() -> int { return 2; }
-    fn g() { assert (f() == 2); assert (::f() == 1); }
+pub mod foo {
+    pub fn f() -> int { return 2; }
+    pub fn g() { assert (f() == 2); assert (::f() == 1); }
 }
 
 fn main() { return foo::g(); }

src/test/run-pass/import-from-foreign.rs

@@ -11,17 +11,13 @@
 // except according to those terms.
 
 mod spam {
-    #[legacy_exports];
-    fn ham() { }
-    fn eggs() { }
+    pub fn ham() { }
+    pub fn eggs() { }
 }
 
 #[abi = "cdecl"]
 extern mod rustrt {
-    #[legacy_exports];
-    use spam::{ham, eggs};
-    export ham;
-    export eggs;
+    pub use spam::{ham, eggs};
 }
 
 fn main() { rustrt::ham(); rustrt::eggs(); }

src/test/run-pass/import-from.rs

@@ -13,9 +13,8 @@
 use spam::{ham, eggs};
 
 mod spam {
-    #[legacy_exports];
-    fn ham() { }
-    fn eggs() { }
+    pub fn ham() { }
+    pub fn eggs() { }
 }
 
 fn main() { ham(); eggs(); }

src/test/run-pass/import-glob-0.rs

@@ -14,30 +14,20 @@
 use dug::too::greedily::and::too::deep::*;
 
 mod module_of_many_things {
-    #[legacy_exports];
-    export f1;
-    export f2;
-    export f4;
-    fn f1() { debug!("f1"); }
-    fn f2() { debug!("f2"); }
+    pub fn f1() { debug!("f1"); }
+    pub fn f2() { debug!("f2"); }
     fn f3() { debug!("f3"); }
-    fn f4() { debug!("f4"); }
+    pub fn f4() { debug!("f4"); }
 }
 
 mod dug {
-    #[legacy_exports];
-    mod too {
-        #[legacy_exports];
-        mod greedily {
-            #[legacy_exports];
-            mod and {
-                #[legacy_exports];
-                mod too {
-                    #[legacy_exports];
-                    mod deep {
-                        #[legacy_exports];
-                        fn nameless_fear() { debug!("Boo!"); }
-                        fn also_redstone() { debug!("Whatever."); }
+    pub mod too {
+        pub mod greedily {
+            pub mod and {
+                pub mod too {
+                    pub mod deep {
+                        pub fn nameless_fear() { debug!("Boo!"); }
+                        pub fn also_redstone() { debug!("Whatever."); }
                     }
                 }
             }

src/test/run-pass/import-glob-1.rs

-// xfail-fast
-
-// Copyright 2012 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.
-
-use a1::b1::word_traveler;
-
-mod a1 {
-    #[legacy_exports];
-    //
-    mod b1 {
-        #[legacy_exports];
-        //
-        use a2::b1::*;
-        //         = move\
-        export word_traveler; //           |
-    }
-    //           |
-    mod b2 {
-        #[legacy_exports];
-        //           |
-        use a2::b2::*;
-        // = move\  -\   |
-        export word_traveler; //   |   |   |
-    } //   |   |   |
-}
-//   |   |   |
-//   |   |   |
-mod a2 {
-    #[legacy_exports];
-    //   |   |   |
-    #[abi = "cdecl"]
-    #[nolink]
-    extern mod b1 {
-        #[legacy_exports];
-        //   |   |   |
-        use a1::b2::*;
-        //   | = move/  -/
-        export word_traveler; //   |
-    }
-    //   |
-    mod b2 {
-        #[legacy_exports];
-        //   |
-        fn word_traveler() { //   |
-            debug!("ahoy!"); //  -/
-        } //
-    } //
-}
-//
-
-
-fn main() { word_traveler(); }

src/test/run-pass/import-trailing-comma.rs

@@ -13,11 +13,9 @@
 use foo::bar::{baz, quux,};
 
 mod foo {
-    #[legacy_exports];
-    mod bar {
-        #[legacy_exports];
-        fn baz() { }
-        fn quux() { }
+    pub mod bar {
+        pub fn baz() { }
+        pub fn quux() { }
     }
 }
 

src/test/run-pass/import.rs

@@ -11,15 +11,13 @@
 // except according to those terms.
 
 mod foo {
-    #[legacy_exports];
-    fn x(y: int) { log(debug, y); }
+    pub fn x(y: int) { log(debug, y); }
 }
 
 mod bar {
-    #[legacy_exports];
     use foo::x;
     use z = foo::x;
-    fn thing() { x(10); z(10); }
+    pub fn thing() { x(10); z(10); }
 }
 
 fn main() { bar::thing(); }

src/test/run-pass/import2.rs

@@ -14,8 +14,7 @@
 use zed::bar;
 
 mod zed {
-    #[legacy_exports];
-    fn bar() { debug!("bar"); }
+    pub fn bar() { debug!("bar"); }
 }
 
 fn main() { bar(); }

src/test/run-pass/import3.rs

@@ -15,10 +15,8 @@
 use zed::bar;
 
 mod baz {
-    #[legacy_exports];
-    mod zed {
-        #[legacy_exports];
-        fn bar() { debug!("bar2"); }
+    pub mod zed {
+        pub fn bar() { debug!("bar2"); }
     }
 }
 

src/test/run-pass/import4.rs

@@ -14,8 +14,7 @@
 use zed::bar;
 
 mod zed {
-    #[legacy_exports];
-    fn bar() { debug!("bar"); }
+    pub fn bar() { debug!("bar"); }
 }
 
 fn main() { let zed = 42; bar(); }

src/test/run-pass/import5.rs

@@ -12,13 +12,9 @@
 
 use foo::bar;
 mod foo {
-    #[legacy_exports];
-    use foo::zed::bar;
-    export bar;
-    export zed;
-    mod zed {
-        #[legacy_exports];
-        fn bar() { debug!("foo"); }
+    pub use foo::zed::bar;
+    pub mod zed {
+        pub fn bar() { debug!("foo"); }
     }
 }
 

src/test/run-pass/import6.rs

@@ -13,15 +13,11 @@
 use foo::zed;
 use bar::baz;
 mod foo {
-    #[legacy_exports];
-    mod zed {
-        #[legacy_exports];
-        fn baz() { debug!("baz"); }
+    pub mod zed {
+        pub fn baz() { debug!("baz"); }
     }
 }
 mod bar {
-    #[legacy_exports];
-    use zed::baz;
-    export baz;
+    pub use zed::baz;
 }
 fn main() { baz(); }

src/test/run-pass/import7.rs

@@ -13,20 +13,14 @@
 use foo::zed;
 use bar::baz;
 mod foo {
-    #[legacy_exports];
-    mod zed {
-        #[legacy_exports];
-        fn baz() { debug!("baz"); }
+    pub mod zed {
+        pub fn baz() { debug!("baz"); }
     }
 }
 mod bar {
-    #[legacy_exports];
-    use zed::baz;
-    export baz;
-    mod foo {
-        #[legacy_exports];
-        mod zed {
-            #[legacy_exports]; }
+    pub use zed::baz;
+    pub mod foo {
+        pub mod zed {}
     }
 }
 fn main() { baz(); }

src/test/run-pass/import8.rs

@@ -15,8 +15,7 @@
 use z = foo::x;
 
 mod foo {
-    #[legacy_exports];
-    fn x(y: int) { log(debug, y); }
+    pub fn x(y: int) { log(debug, y); }
 }
 
 fn main() { x(10); z(10); }

src/test/run-pass/inner-module.rs

@@ -13,12 +13,10 @@
 
 // -*- rust -*-
 mod inner {
-    #[legacy_exports];
-    mod inner2 {
-        #[legacy_exports];
-        fn hello() { debug!("hello, modular world"); }
+    pub mod inner2 {
+        pub fn hello() { debug!("hello, modular world"); }
     }
-    fn hello() { inner2::hello(); }
+    pub fn hello() { inner2::hello(); }
 }
 
 fn main() { inner::hello(); inner::inner2::hello(); }

src/test/run-pass/intrinsic-alignment.rs

@@ -12,9 +12,8 @@
 
 #[abi = "rust-intrinsic"]
 extern mod rusti {
-    #[legacy_exports];
-    fn pref_align_of<T>() -> uint;
-    fn min_align_of<T>() -> uint;
+    pub fn pref_align_of<T>() -> uint;
+    pub fn min_align_of<T>() -> uint;
 }
 
 #[cfg(target_os = "linux")]

src/test/run-pass/intrinsic-atomics.rs

@@ -10,22 +10,21 @@
 
 #[abi = "rust-intrinsic"]
 extern mod rusti {
-    #[legacy_exports];
-    fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
-    fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
-    fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;
-
-    fn atomic_xchg(dst: &mut int, src: int) -> int;
-    fn atomic_xchg_acq(dst: &mut int, src: int) -> int;
-    fn atomic_xchg_rel(dst: &mut int, src: int) -> int;
-    
-    fn atomic_xadd(dst: &mut int, src: int) -> int;
-    fn atomic_xadd_acq(dst: &mut int, src: int) -> int;
-    fn atomic_xadd_rel(dst: &mut int, src: int) -> int;
-    
-    fn atomic_xsub(dst: &mut int, src: int) -> int;
-    fn atomic_xsub_acq(dst: &mut int, src: int) -> int;
-    fn atomic_xsub_rel(dst: &mut int, src: int) -> int;
+    pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
+    pub fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
+    pub fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;
+
+    pub fn atomic_xchg(dst: &mut int, src: int) -> int;
+    pub fn atomic_xchg_acq(dst: &mut int, src: int) -> int;
+    pub fn atomic_xchg_rel(dst: &mut int, src: int) -> int;
+    
+    pub fn atomic_xadd(dst: &mut int, src: int) -> int;
+    pub fn atomic_xadd_acq(dst: &mut int, src: int) -> int;
+    pub fn atomic_xadd_rel(dst: &mut int, src: int) -> int;
+    
+    pub fn atomic_xsub(dst: &mut int, src: int) -> int;
+    pub fn atomic_xsub_acq(dst: &mut int, src: int) -> int;
+    pub fn atomic_xsub_rel(dst: &mut int, src: int) -> int;
 }
 
 fn main() {

src/test/run-pass/intrinsic-frame-address.rs

@@ -12,8 +12,7 @@
 #[legacy_modes];
 #[abi = "rust-intrinsic"]
 extern mod rusti {
-    #[legacy_exports];
-    fn frame_address(f: &once fn(*u8));
+    pub fn frame_address(f: &once fn(*u8));
 }
 
 fn main() {

src/test/run-pass/issue-1251.rs

@@ -11,8 +11,7 @@
 #[link(name = "get_task_id")];
 
 extern mod rustrt {
-    #[legacy_exports];
-      fn get_task_id() -> libc::intptr_t;
+    pub fn get_task_id() -> libc::intptr_t;
 }
 
 fn main() { }

src/test/run-pass/issue-1866.rs

@@ -10,20 +10,16 @@
 
 // xfail-test
 mod a {
-    #[legacy_exports];
-    type rust_task = uint;
-    extern mod rustrt {
-        #[legacy_exports];
-        fn rust_task_is_unwinding(rt: *rust_task) -> bool;
+    pub type rust_task = uint;
+    pub extern mod rustrt {
+        pub fn rust_task_is_unwinding(rt: *rust_task) -> bool;
     }
 }
 
 mod b {
-    #[legacy_exports];
-    type rust_task = bool;
-    extern mod rustrt {
-        #[legacy_exports];
-        fn rust_task_is_unwinding(rt: *rust_task) -> bool;
+    pub type rust_task = bool;
+    pub extern mod rustrt {
+        pub fn rust_task_is_unwinding(rt: *rust_task) -> bool;
     }
 }
 

src/test/run-pass/issue-2904.rs

@@ -75,14 +75,13 @@ fn read_board_grid<rdr: &static io::Reader>(+in: rdr) -> ~[~[square]] {
 }
 
 mod test {
-    #[legacy_exports];
     #[test]
-    fn trivial_to_str() {
+    pub fn trivial_to_str() {
         assert lambda.to_str() == "\\"
     }
 
     #[test]
-    fn read_simple_board() {
+    pub fn read_simple_board() {
         let s = include_str!("./maps/contest1.map");
         io::with_str_reader(s, read_board_grid)
     }

src/test/run-pass/item-attributes.rs

@@ -25,49 +25,40 @@
 // These are are attributes of the following mod
 #[attr1 = "val"]
 #[attr2 = "val"]
-mod test_first_item_in_file_mod {
-    #[legacy_exports]; }
+mod test_first_item_in_file_mod {}
 
 mod test_single_attr_outer {
-    #[legacy_exports];
-
     #[attr = "val"]
-    const x: int = 10;
+    pub const x: int = 10;
 
     #[attr = "val"]
-    fn f() { }
+    pub fn f() { }
 
     #[attr = "val"]
-    mod mod1 {
-        #[legacy_exports]; }
+    pub mod mod1 {}
 
     #[attr = "val"]
     #[abi = "cdecl"]
-    extern mod rustrt {
-        #[legacy_exports]; }
+    pub extern mod rustrt {}
 }
 
 mod test_multi_attr_outer {
-    #[legacy_exports];
-
     #[attr1 = "val"]
     #[attr2 = "val"]
-    const x: int = 10;
+    pub const x: int = 10;
 
     #[attr1 = "val"]
     #[attr2 = "val"]
-    fn f() { }
+    pub fn f() { }
 
     #[attr1 = "val"]
     #[attr2 = "val"]
-    mod mod1 {
-        #[legacy_exports]; }
+    pub mod mod1 {}
 
     #[attr1 = "val"]
     #[attr2 = "val"]
     #[abi = "cdecl"]
-    extern mod rustrt {
-        #[legacy_exports]; }
+    pub extern mod rustrt {}
 
     #[attr1 = "val"]
     #[attr2 = "val"]
@@ -75,10 +66,7 @@ mod mod1 {
 }
 
 mod test_stmt_single_attr_outer {
-    #[legacy_exports];
-
-    fn f() {
-
+    pub fn f() {
         #[attr = "val"]
         const x: int = 10;
 
@@ -87,21 +75,17 @@ fn f() { }
 
         #[attr = "val"]
         mod mod1 {
-            #[legacy_exports];
         }
 
         #[attr = "val"]
         #[abi = "cdecl"]
         extern mod rustrt {
-            #[legacy_exports];
         }
     }
 }
 
 mod test_stmt_multi_attr_outer {
-    #[legacy_exports];
-
-    fn f() {
+    pub fn f() {
 
         #[attr1 = "val"]
         #[attr2 = "val"]
@@ -115,34 +99,26 @@ fn f() { }
         #[attr1 = "val"]
         #[attr2 = "val"]
         mod mod1 {
-            #[legacy_exports];
         }
 
         #[attr1 = "val"]
         #[attr2 = "val"]
         #[abi = "cdecl"]
         extern mod rustrt {
-            #[legacy_exports];
         }
         */
     }
 }
 
 mod test_attr_inner {
-    #[legacy_exports];
-
-    mod m {
-        #[legacy_exports];
+    pub mod m {
         // This is an attribute of mod m
         #[attr = "val"];
     }
 }
 
 mod test_attr_inner_then_outer {
-    #[legacy_exports];
-
-    mod m {
-        #[legacy_exports];
+    pub mod m {
         // This is an attribute of mod m
         #[attr = "val"];
         // This is an attribute of fn f
@@ -152,9 +128,7 @@ fn f() { }
 }
 
 mod test_attr_inner_then_outer_multi {
-    #[legacy_exports];
-    mod m {
-        #[legacy_exports];
+    pub mod m {
         // This is an attribute of mod m
         #[attr1 = "val"];
         #[attr2 = "val"];
@@ -166,11 +140,9 @@ fn f() { }
 }
 
 mod test_distinguish_syntax_ext {
-    #[legacy_exports];
-
     extern mod std;
 
-    fn f() {
+    pub fn f() {
         fmt!("test%s", ~"s");
         #[attr = "val"]
         fn g() { }
@@ -178,19 +150,16 @@ fn g() { }
 }
 
 mod test_other_forms {
-    #[legacy_exports];
     #[attr]
     #[attr(word)]
     #[attr(attr(word))]
     #[attr(key1 = "val", key2 = "val", attr)]
-    fn f() { }
+    pub fn f() { }
 }
 
 mod test_foreign_items {
-    #[legacy_exports];
     #[abi = "cdecl"]
-    extern mod rustrt {
-        #[legacy_exports];
+    pub extern mod rustrt {
         #[attr];
 
         #[attr]
@@ -199,7 +168,6 @@ mod test_foreign_items {
 }
 
 mod test_literals {
-    #[legacy_exports];
     #[str = "s"];
     #[char = 'c'];
     #[int = 100];
@@ -209,8 +177,7 @@ mod test_literals {
     #[mach_float = 1.0f32];
     #[nil = ()];
     #[bool = true];
-    mod m {
-        #[legacy_exports]; }
+    mod m {}
 }
 
 fn test_fn_inner() {

src/test/run-pass/item-name-overload.rs

@@ -13,13 +13,11 @@
 
 // -*- rust -*-
 mod foo {
-    #[legacy_exports];
-    fn baz() { }
+    pub fn baz() { }
 }
 
 mod bar {
-    #[legacy_exports];
-    fn baz() { }
+    pub fn baz() { }
 }
 
 fn main() { }

src/test/run-pass/keyword-changes-2012-07-31.rs

@@ -16,7 +16,6 @@ fn main() {
 }
 
 mod foo {
-    #[legacy_exports];
 }
 
 fn bar() -> int {

src/test/run-pass/mod-inside-fn.rs

@@ -10,8 +10,7 @@
 
 fn f() -> int {
     mod m {
-        #[legacy_exports];
-        fn g() -> int { 720 }
+        pub fn g() -> int { 720 }
     }
 
     m::g()

src/test/run-pass/mod-view-items.rs

@@ -17,9 +17,8 @@
 // begin failing.
 
 mod m {
-    #[legacy_exports];
     use core::vec;
-    fn f() -> ~[int] { vec::from_elem(1u, 0) }
+    pub fn f() -> ~[int] { vec::from_elem(1u, 0) }
 }
 
 fn main() { let x = m::f(); }

src/test/run-pass/morestack-address.rs

@@ -11,8 +11,7 @@
 #[nolink]
 #[abi = "rust-intrinsic"]
 extern mod rusti {
-    #[legacy_exports];
-    fn morestack_addr() -> *();
+    pub fn morestack_addr() -> *();
 }
 
 fn main() {

src/test/run-pass/morestack6.rs

@@ -12,15 +12,14 @@
 // external symbols as close to the red zone as possible.
 
 extern mod rustrt {
-    #[legacy_exports];
-    fn debug_get_stk_seg() -> *u8;
+    pub fn debug_get_stk_seg() -> *u8;
 
-    fn rust_get_sched_id() -> libc::intptr_t;
-    fn last_os_error() -> ~str;
-    fn rust_getcwd() -> ~str;
-    fn get_task_id() -> libc::intptr_t;
-    fn rust_sched_threads();
-    fn rust_get_task();
+    pub fn rust_get_sched_id() -> libc::intptr_t;
+    pub fn last_os_error() -> ~str;
+    pub fn rust_getcwd() -> ~str;
+    pub fn get_task_id() -> libc::intptr_t;
+    pub fn rust_sched_threads();
+    pub fn rust_get_task();
 }
 
 fn calllink01() { unsafe { rustrt::rust_get_sched_id(); } }

src/test/run-pass/nil-decl-in-foreign.rs

@@ -11,7 +11,6 @@
 // Issue #901
 #[nolink]
 extern mod libc {
-    #[legacy_exports];
-    fn printf(x: ());
+    pub fn printf(x: ());
 }
 fn main() { }

src/test/run-pass/path.rs

@@ -11,8 +11,7 @@
 
 
 mod foo {
-    #[legacy_exports];
-    fn bar(offset: uint) { }
+    pub fn bar(offset: uint) { }
 }
 
 fn main() { foo::bar(0u); }

src/test/run-pass/rec-align-u32.rs

@@ -12,9 +12,8 @@
 
 #[abi = "rust-intrinsic"]
 extern mod rusti {
-    #[legacy_exports];
-    fn pref_align_of<T>() -> uint;
-    fn min_align_of<T>() -> uint;
+    pub fn pref_align_of<T>() -> uint;
+    pub fn min_align_of<T>() -> uint;
 }
 
 // This is the type with the questionable alignment
@@ -32,16 +31,14 @@ struct Outer {
 
 #[cfg(target_arch = "x86")]
 mod m {
-    #[legacy_exports];
-    fn align() -> uint { 4u }
-    fn size() -> uint { 8u }
+    pub fn align() -> uint { 4u }
+    pub fn size() -> uint { 8u }
 }
 
 #[cfg(target_arch = "x86_64")]
 mod m {
-    #[legacy_exports];
-    fn align() -> uint { 4u }
-    fn size() -> uint { 8u }
+    pub fn align() -> uint { 4u }
+    pub fn size() -> uint { 8u }
 }
 
 fn main() {

src/test/run-pass/rec-align-u64.rs

@@ -12,9 +12,8 @@
 
 #[abi = "rust-intrinsic"]
 extern mod rusti {
-    #[legacy_exports];
-    fn pref_align_of<T>() -> uint;
-    fn min_align_of<T>() -> uint;
+    pub fn pref_align_of<T>() -> uint;
+    pub fn min_align_of<T>() -> uint;
 }
 
 // This is the type with the questionable alignment
@@ -34,30 +33,25 @@ struct Outer {
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
 mod m {
-    #[legacy_exports];
     #[cfg(target_arch = "x86")]
-    mod m {
-        #[legacy_exports];
-        fn align() -> uint { 4u }
-        fn size() -> uint { 12u }
+    pub mod m {
+        pub fn align() -> uint { 4u }
+        pub fn size() -> uint { 12u }
     }
 
     #[cfg(target_arch = "x86_64")]
     mod m {
-        #[legacy_exports];
-        fn align() -> uint { 8u }
-        fn size() -> uint { 16u }
+        pub fn align() -> uint { 8u }
+        pub fn size() -> uint { 16u }
     }
 }
 
 #[cfg(target_os = "win32")]
 mod m {
-    #[legacy_exports];
     #[cfg(target_arch = "x86")]
-    mod m {
-        #[legacy_exports];
-        fn align() -> uint { 8u }
-        fn size() -> uint { 16u }
+    pub mod m {
+        pub fn align() -> uint { 8u }
+        pub fn size() -> uint { 16u }
     }
 }
 

src/test/run-pass/rt-sched-1.rs

@@ -19,11 +19,10 @@
 type closure = *libc::c_void;
 
 extern mod rustrt {
-    #[legacy_exports];
-    fn rust_new_sched(num_threads: libc::uintptr_t) -> sched_id;
-    fn rust_get_sched_id() -> sched_id;
-    fn rust_new_task_in_sched(id: sched_id) -> task_id;
-    fn start_task(id: task_id, f: closure);
+    pub fn rust_new_sched(num_threads: libc::uintptr_t) -> sched_id;
+    pub fn rust_get_sched_id() -> sched_id;
+    pub fn rust_new_task_in_sched(id: sched_id) -> task_id;
+    pub fn start_task(id: task_id, f: closure);
 }
 
 fn main() {

src/test/run-pass/self-shadowing-import.rs

@@ -11,20 +11,16 @@
 // except according to those terms.
 
 mod a {
-    #[legacy_exports];
-    mod b {
-        #[legacy_exports];
-        mod a {
-            #[legacy_exports];
-            fn foo() -> int { return 1; }
+    pub mod b {
+        pub mod a {
+            pub fn foo() -> int { return 1; }
         }
     }
 }
 
 mod c {
-    #[legacy_exports];
     use a::b::a;
-    fn bar() { assert (a::foo() == 1); }
+    pub fn bar() { assert (a::foo() == 1); }
 }
 
 fn main() { c::bar(); }

src/test/run-pass/static-method-xcrate.rs

@@ -10,7 +10,6 @@
 
 // xfail-fast
 // aux-build:static-methods-crate.rs
-#[legacy_exports];
 
 extern mod static_methods_crate;
 use static_methods_crate::read;

src/test/run-pass/struct-return.rs

@@ -13,9 +13,8 @@ struct Floats { a: f64, b: u8, c: f64 }
 
 #[nolink]
 extern mod rustrt {
-    #[legacy_exports];
-    fn debug_abi_1(++q: Quad) -> Quad;
-    fn debug_abi_2(++f: Floats) -> Floats;
+    pub fn debug_abi_1(++q: Quad) -> Quad;
+    pub fn debug_abi_2(++f: Floats) -> Floats;
 }
 
 fn test1() {

src/test/run-pass/syntax-extension-source-utils.rs

@@ -10,18 +10,15 @@
 
 // This test is brittle!
 // xfail-pretty - the pretty tests lose path information, breaking include!
-#[legacy_exports];
 
-mod m1 {
-    #[legacy_exports];
-    mod m2 {
-        #[legacy_exports];
-        fn where_am_i() -> ~str { (module_path!()).to_owned() }
+pub mod m1 {
+    pub mod m2 {
+        pub fn where_am_i() -> ~str { (module_path!()).to_owned() }
     }
 }
 
 fn main() {
-    assert(line!() == 24);
+    assert(line!() == 21);
     assert(col!() == 11);
     assert(file!().to_owned().ends_with(~"syntax-extension-source-utils.rs"));
     assert(stringify!((2*3) + 5).to_owned() == ~"( 2 * 3 ) + 5");

src/test/run-pass/tag-exports.rs

@@ -13,21 +13,10 @@
 use alder::*;
 
 mod alder {
-    #[legacy_exports];
-  export burnside;
-  export couch;
-  export everett;
-  export flanders;
-  export irving;
-  export johnson;
-  export kearney;
-  export marshall;
-
-  enum burnside { couch, davis }
-  enum everett { flanders, glisan, hoyt }
-  enum irving { johnson, kearney, lovejoy }
-  enum marshall { northrup, overton }
-
+    pub enum burnside { couch, davis }
+    pub enum everett { flanders, glisan, hoyt }
+    pub enum irving { johnson, kearney, lovejoy }
+    pub enum marshall { northrup, overton }
 }
 
 fn main() {

src/test/run-pass/type-in-nested-module.rs

@@ -11,12 +11,10 @@
 
 
 mod a {
-    #[legacy_exports];
-    mod b {
-        #[legacy_exports];
-        type t = int;
+    pub mod b {
+        pub type t = int;
 
-        fn foo() { let x: t = 10; }
+        pub fn foo() { let x: t = 10; }
     }
 }
 

src/test/run-pass/use-import-export.rs

@@ -11,13 +11,11 @@
 
 
 mod foo {
-    #[legacy_exports];
-    fn x() -> int { return 1; }
+    pub fn x() -> int { return 1; }
 }
 
 mod bar {
-    #[legacy_exports];
-    fn y() -> int { return 1; }
+    pub fn y() -> int { return 1; }
 }
 
 fn main() { foo::x(); bar::y(); }

src/test/run-pass/use-mod.rs

@@ -13,10 +13,8 @@
 use mod a::b;
 
 mod a {
-    #[legacy_exports];
-    mod b {
-        #[legacy_exports];
-        fn f() {}
+    pub mod b {
+        pub fn f() {}
     }
 }
 

src/test/run-pass/use.rs

@@ -19,9 +19,8 @@
 use core::str;
 use x = zed::str;
 mod baz {
-    #[legacy_exports];
-    use bar::str;
-    use x = core::str;
+    pub use bar::str;
+    pub use x = core::str;
 }
 
 fn main() { }

src/test/run-pass/warn-ctypes-inhibit.rs

@@ -14,8 +14,7 @@
 
 #[nolink]
 extern mod libc {
-    #[legacy_exports];
-    fn malloc(size: int) -> *u8;
+    pub fn malloc(size: int) -> *u8;
 }
 
 fn main() {

src/test/run-pass/x86stdcall2.rs

@@ -17,10 +17,10 @@
 #[cfg(target_os = "win32")]
 #[abi = "stdcall"]
 extern mod kernel32 {
-    #[legacy_exports];
-       fn GetProcessHeap() -> HANDLE;
-       fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBytes: SIZE_T) -> LPVOID;
-       fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPVOID) -> BOOL;
+    pub fn GetProcessHeap() -> HANDLE;
+    pub fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBytes: SIZE_T)
+                  -> LPVOID;
+    pub fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPVOID) -> BOOL;
 }