test: De-export aux, bench, compile-fail, and run-fail. rs=deexporting

src/test/auxiliary/cci_borrow_lib.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[legacy_exports];
+pub fn foo(x: &uint) -> uint {
-
-fn foo(x: &uint) -> uint {
     *x
 }

src/test/auxiliary/cci_class.rs

@@ -8,22 +8,17 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[legacy_exports];
+pub mod kitties {
-mod kitties {
+    pub struct cat {
-    #[legacy_exports];
+      priv mut meows : uint,
 
-struct cat {
+      how_hungry : int,
-  priv mut meows : uint,
+    }
 
-  how_hungry : int,
+    pub fn cat(in_x : uint, in_y : int) -> cat  {
-
-}
-
-    fn cat(in_x : uint, in_y : int) -> cat  {
         cat {
             meows: in_x,
             how_hungry: in_y
         }
     }
-
 }

src/test/auxiliary/cci_class_2.rs

@@ -8,26 +8,23 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[legacy_exports];
+pub mod kitties {
+    pub struct cat {
+      priv mut meows : uint,
 
-mod kitties {
+      how_hungry : int,
-    #[legacy_exports];
 
-struct cat {
+    }
-  priv mut meows : uint,
 
-  how_hungry : int,
+    pub impl cat {
-
-}
-
-    impl cat {
         fn speak() {}
     }
-    fn cat(in_x : uint, in_y : int) -> cat {
+
+    pub fn cat(in_x : uint, in_y : int) -> cat {
         cat {
             meows: in_x,
             how_hungry: in_y
         }
     }
-
 }
+

src/test/auxiliary/cci_class_3.rs

@@ -8,28 +8,22 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[legacy_exports];
+pub mod kitties {
+    pub struct cat {
+        priv mut meows : uint,
 
-mod kitties {
+        how_hungry : int,
-    #[legacy_exports];
+    }
 
-struct cat {
+    pub impl cat {
-  priv mut meows : uint,
-
-  how_hungry : int,
-}
-
-    impl cat {
         fn speak() { self.meows += 1u; }
         fn meow_count() -> uint { self.meows }
     }
 
-    fn cat(in_x : uint, in_y : int) -> cat {
+    pub fn cat(in_x : uint, in_y : int) -> cat {
         cat {
             meows: in_x,
             how_hungry: in_y
         }
     }
-
-
 }

src/test/auxiliary/cci_class_4.rs

@@ -8,35 +8,31 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[legacy_exports];
+pub mod kitties {
-mod kitties {
+    pub struct cat {
-    #[legacy_exports];
+        priv mut meows : uint,
 
-struct cat {
+        mut how_hungry : int,
-  priv mut meows : uint,
+        name : ~str,
-
-  mut how_hungry : int,
-  name : ~str,
-}
-
-impl cat {
-
-  fn speak() { self.meow(); }
-
-  fn eat() -> bool {
-    if self.how_hungry > 0 {
-        error!("OM NOM NOM");
-        self.how_hungry -= 2;
-        return true;
     }
-    else {
-        error!("Not hungry!");
-        return false;
-    }
-  }
-}
 
-    priv impl cat {
+    pub impl cat {
+      fn speak() { self.meow(); }
+
+      fn eat() -> bool {
+        if self.how_hungry > 0 {
+            error!("OM NOM NOM");
+            self.how_hungry -= 2;
+            return true;
+        }
+        else {
+            error!("Not hungry!");
+            return false;
+        }
+      }
+    }
+
+    pub impl cat {
         fn meow() {
             error!("Meow");
             self.meows += 1u;
@@ -46,12 +42,11 @@ impl cat {
         }
     }
 
-    fn cat(in_x : uint, in_y : int, in_name: ~str) -> cat {
+    pub fn cat(in_x : uint, in_y : int, in_name: ~str) -> cat {
         cat {
             meows: in_x,
             how_hungry: in_y,
             name: in_name
         }
     }
-
 }

src/test/auxiliary/cci_class_5.rs

@@ -8,14 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-mod kitties {
+pub mod kitties {
-
     pub struct cat {
         priv mut meows : uint,
         how_hungry : int,
     }
 
-    impl cat {
+    pub impl cat {
       priv fn nap() { for uint::range(1, 10000u) |_i|{}}
     }
 
@@ -26,4 +25,4 @@ mod kitties {
         }
     }
 
-}
+}

src/test/auxiliary/cci_class_6.rs

@@ -8,32 +8,27 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[legacy_exports];
+pub mod kitties {
+    pub struct cat<U> {
+        priv mut info : ~[U],
+        priv mut meows : uint,
 
-mod kitties {
+        how_hungry : int,
-    #[legacy_exports];
+    }
 
-struct cat<U> {
+    pub impl<U> cat<U> {
-  priv mut info : ~[U],
-  priv mut meows : uint,
-
-  how_hungry : int,
-}
-
-    impl<U> cat<U> {
         fn speak<T>(stuff: ~[T]) {
             self.meows += stuff.len();
         }
         fn meow_count() -> uint { self.meows }
     }
 
-fn cat<U>(in_x : uint, in_y : int, -in_info: ~[U]) -> cat<U> {
+    pub fn cat<U>(in_x : uint, in_y : int, -in_info: ~[U]) -> cat<U> {
-    cat {
+        cat {
-        meows: in_x,
+            meows: in_x,
-        how_hungry: in_y,
+            how_hungry: in_y,
-        info: move in_info
+            info: move in_info
+        }
     }
 }
 
-
-}

src/test/auxiliary/cci_class_trait.rs

@@ -8,11 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-mod animals {
+pub mod animals {
-    #[legacy_exports];
+    pub trait noisy {
-
+        fn speak();
-trait noisy {
+    }
-  fn speak();
-}
-
 }

src/test/auxiliary/cci_intrinsic.rs

@@ -8,10 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[legacy_exports];
 #[abi = "rust-intrinsic"]
-extern mod rusti {
+pub 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;
@@ -30,7 +28,7 @@ extern mod rusti {
 }
 
 #[inline(always)]
-fn atomic_xchg(dst: &mut int, src: int) -> int {
+pub fn atomic_xchg(dst: &mut int, src: int) -> int {
     unsafe {
         rusti::atomic_xchg(dst, src)
     }

src/test/auxiliary/cci_iter_lib.rs

@@ -10,10 +10,9 @@
 
 #[link(name="cci_iter_lib", vers="0.0")];
 #[legacy_modes];
-#[legacy_exports];
 
 #[inline]
-fn iter<T>(v: ~[T], f: fn(T)) {
+pub fn iter<T>(v: ~[T], f: fn(T)) {
     let mut i = 0u;
     let n = vec::len(v);
     while i < n {

src/test/auxiliary/cci_nested_lib.rs

@@ -9,19 +9,18 @@
 // except according to those terms.
 
 #[legacy_modes];
-#[legacy_exports];
 
 use dvec::DVec;
 
-struct Entry<A,B> {key: A, value: B}
+pub struct Entry<A,B> {key: A, value: B}
 
-struct alist<A,B> { eq_fn: fn@(A,A) -> bool, data: DVec<Entry<A,B>> }
+pub struct alist<A,B> { eq_fn: fn@(A,A) -> bool, data: DVec<Entry<A,B>> }
 
-fn alist_add<A: Copy, B: Copy>(lst: alist<A,B>, k: A, v: B) {
+pub fn alist_add<A: Copy, B: Copy>(lst: alist<A,B>, k: A, v: B) {
     lst.data.push(Entry{key:k, value:v});
 }
 
-fn alist_get<A: Copy, B: Copy>(lst: alist<A,B>, k: A) -> B {
+pub fn alist_get<A: Copy, B: Copy>(lst: alist<A,B>, k: A) -> B {
     let eq_fn = lst.eq_fn;
     for lst.data.each |entry| {
         if eq_fn(entry.key, k) { return entry.value; }
@@ -30,13 +29,13 @@ fn alist_get<A: Copy, B: Copy>(lst: alist<A,B>, k: A) -> B {
 }
 
 #[inline]
-fn new_int_alist<B: Copy>() -> alist<int, B> {
+pub fn new_int_alist<B: Copy>() -> alist<int, B> {
     fn eq_int(&&a: int, &&b: int) -> bool { a == b }
     return alist {eq_fn: eq_int, data: DVec()};
 }
 
 #[inline]
-fn new_int_alist_2<B: Copy>() -> alist<int, B> {
+pub fn new_int_alist_2<B: Copy>() -> alist<int, B> {
     #[inline]
     fn eq_int(&&a: int, &&b: int) -> bool { a == b }
     return alist {eq_fn: eq_int, data: DVec()};

src/test/auxiliary/cci_no_inline_lib.rs

@@ -9,10 +9,9 @@
 // except according to those terms.
 
 #[link(name="cci_no_inline_lib", vers="0.0")];
-#[legacy_exports];
 
 // same as cci_iter_lib, more-or-less, but not marked inline
-fn iter(v: ~[uint], f: fn(uint)) {
+pub fn iter(v: ~[uint], f: fn(uint)) {
     let mut i = 0u;
     let n = vec::len(v);
     while i < n {
@@ -20,3 +19,4 @@ fn iter(v: ~[uint], f: fn(uint)) {
         i += 1u;
     }
 }
+

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

@@ -10,40 +10,31 @@
 
 #[link(name = "crate_method_reexport_grrrrrrr2")];
 
-export rust;
-
 use name_pool::add;
 
 mod name_pool {
-    #[legacy_exports];
+    pub type name_pool = ();
 
-    type name_pool = ();
+    pub trait add {
-
-    trait add {
         fn add(s: ~str);
     }
 
-    impl name_pool: add {
+    pub impl name_pool: add {
         fn add(s: ~str) {
         }
     }
 }
 
-mod rust {
+pub mod rust {
-    #[legacy_exports];
-
     use name_pool::add;
-    export add;
-    export rt;
-    export cx;
 
-    type rt = @();
+    pub type rt = @();
 
-    trait cx {
+    pub trait cx {
         fn cx();
     }
 
-    impl rt: cx {
+    pub impl rt: cx {
         fn cx() {
         }
     }

src/test/auxiliary/crateresolve1-1.rs

@@ -12,6 +12,5 @@
        vers = "0.1")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn f() -> int { 10 }
+pub fn f() -> int { 10 }

src/test/auxiliary/crateresolve1-2.rs

@@ -12,6 +12,5 @@
        vers = "0.2")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn f() -> int { 20 }
+pub fn f() -> int { 20 }

src/test/auxiliary/crateresolve1-3.rs

@@ -12,6 +12,5 @@
        vers = "0.3")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn f() -> int { 30 }
+pub fn f() -> int { 30 }

src/test/auxiliary/crateresolve2-1.rs

@@ -12,6 +12,5 @@
        vers = "0.1")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn f() -> int { 10 }
+pub fn f() -> int { 10 }

src/test/auxiliary/crateresolve2-2.rs

@@ -12,6 +12,5 @@
        vers = "0.2")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn f() -> int { 20 }
+pub fn f() -> int { 20 }

src/test/auxiliary/crateresolve2-3.rs

@@ -12,6 +12,5 @@
        vers = "0.3")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn f() -> int { 30 }
+pub fn f() -> int { 30 }

src/test/auxiliary/crateresolve3-1.rs

@@ -12,6 +12,5 @@
        vers = "0.1")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn f() -> int { 10 }
+pub fn f() -> int { 10 }

src/test/auxiliary/crateresolve3-2.rs

@@ -12,6 +12,5 @@
        vers = "0.2")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn g() -> int { 20 }
+pub fn g() -> int { 20 }

src/test/auxiliary/crateresolve4a-1.rs

@@ -10,6 +10,5 @@
 
 #[link(name = "crateresolve4a", vers = "0.1")];
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn f() -> int { 10 }
+pub fn f() -> int { 10 }

src/test/auxiliary/crateresolve4a-2.rs

@@ -10,6 +10,5 @@
 
 #[link(name = "crateresolve4a", vers= "0.2")];
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn g() -> int { 20 }
+pub fn g() -> int { 20 }

src/test/auxiliary/crateresolve4b-1.rs

@@ -12,8 +12,7 @@
 // aux-build:crateresolve4a-2.rs
 #[link(name = "crateresolve4b", vers = "0.1")];
 #[crate_type = "lib"];
-#[legacy_exports];
 
 extern mod crateresolve4a(vers="0.2");
 
-fn f() -> int { crateresolve4a::g() }
+pub fn f() -> int { crateresolve4a::g() }

src/test/auxiliary/crateresolve4b-2.rs

@@ -12,8 +12,7 @@
 // aux-build:crateresolve4a-2.rs
 #[link(name = "crateresolve4b", vers = "0.2")];
 #[crate_type = "lib"];
-#[legacy_exports];
 
 extern mod crateresolve4a(vers="0.1");
 
-fn g() -> int { crateresolve4a::f() }
+pub fn g() -> int { crateresolve4a::f() }

src/test/auxiliary/crateresolve5-1.rs

@@ -12,18 +12,17 @@
        vers = "0.1")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-struct NameVal { name: ~str, val: int }
+pub struct NameVal { name: ~str, val: int }
 
-fn struct_nameval() -> NameVal {
+pub fn struct_nameval() -> NameVal {
     NameVal { name: ~"crateresolve5", val: 10 }
 }
 
-enum e {
+pub enum e {
     e_val
 }
 
-fn nominal() -> e { e_val }
+pub fn nominal() -> e { e_val }
 
-fn f() -> int { 10 }
+pub fn f() -> int { 10 }

src/test/auxiliary/crateresolve5-2.rs

@@ -12,17 +12,16 @@
        vers = "0.2")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-struct NameVal { name: ~str, val: int }
+pub struct NameVal { name: ~str, val: int }
-fn struct_nameval() -> NameVal {
+pub fn struct_nameval() -> NameVal {
     NameVal { name: ~"crateresolve5", val: 10 }
 }
 
-enum e {
+pub enum e {
     e_val
 }
 
-fn nominal() -> e { e_val }
+pub fn nominal() -> e { e_val }
 
-fn f() -> int { 20 }
+pub fn f() -> int { 20 }

src/test/auxiliary/crateresolve7x.rs

@@ -13,15 +13,12 @@
 // aux-build:crateresolve_calories-2.rs
 
 // These both have the same version but differ in other metadata
-#[legacy_exports];
+pub mod a {
-mod a {
-    #[legacy_exports];
     extern mod cr_1 (name = "crateresolve_calories", vers = "0.1", calories="100");
-    fn f() -> int { cr_1::f() }
+    pub fn f() -> int { cr_1::f() }
 }
 
-mod b {
+pub mod b {
-    #[legacy_exports];
     extern mod cr_2 (name = "crateresolve_calories", vers = "0.1", calories="200");
-    fn f() -> int { cr_2::f() }
+    pub fn f() -> int { cr_2::f() }
 }

src/test/auxiliary/crateresolve_calories-1.rs

@@ -13,6 +13,5 @@
        calories = "100")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn f() -> int { 100 }
+pub fn f() -> int { 100 }

src/test/auxiliary/crateresolve_calories-2.rs

@@ -13,6 +13,5 @@
        calories = "200")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-fn f() -> int { 200 }
+pub fn f() -> int { 200 }

src/test/auxiliary/extern-crosscrate-source.rs

@@ -12,22 +12,20 @@
        vers = "0.1")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
 
-extern mod rustrt {
+pub extern mod rustrt {
-    #[legacy_exports];
+    pub fn rust_dbg_call(cb: *u8,
-    fn rust_dbg_call(cb: *u8,
+                         data: libc::uintptr_t) -> libc::uintptr_t;
-                     data: libc::uintptr_t) -> libc::uintptr_t;
 }
 
-fn fact(n: uint) -> uint {
+pub fn fact(n: uint) -> uint {
     unsafe {
         debug!("n = %?", n);
         rustrt::rust_dbg_call(cb, n)
     }
 }
 
-extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
+pub extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
     if data == 1u {
         data
     } else {

src/test/auxiliary/foreign_lib.rs

@@ -9,9 +9,7 @@
 // except according to those terms.
 
 #[link(name="foreign_lib", vers="0.0")];
-#[legacy_exports];
 
-extern mod rustrt {
+pub extern mod rustrt {
-    #[legacy_exports];
+    pub fn last_os_error() -> ~str;
-    fn last_os_error() -> ~str;
+}
-}

src/test/auxiliary/issue-2380.rs

@@ -10,11 +10,10 @@
 
 #[link(name = "a", vers = "0.0")];
 #[crate_type = "lib"];
-#[legacy_exports];
 
-trait i<T> { }
+pub trait i<T> { }
 
-fn f<T>() -> i<T> {
+pub fn f<T>() -> i<T> {
     impl<T> (): i<T> { }
 
     () as i::<T>

src/test/auxiliary/issue-3012-1.rs

@@ -10,27 +10,21 @@
 
 #[link(name="socketlib", vers="0.0")];
 #[crate_type = "lib"];
-#[legacy_exports];
 
-mod socket {
+pub mod socket {
-    #[legacy_exports];
+    pub struct socket_handle {
-
+        sockfd: libc::c_int,
-export socket_handle;
-
-struct socket_handle {
-    sockfd: libc::c_int,
-}
-
-impl socket_handle : Drop {
-    fn finalize(&self) {
-        /* c::close(self.sockfd); */
     }
-}
 
-    fn socket_handle(x: libc::c_int) -> socket_handle {
+    pub impl socket_handle : Drop {
+        fn finalize(&self) {
+            /* c::close(self.sockfd); */
+        }
+    }
+
+    pub fn socket_handle(x: libc::c_int) -> socket_handle {
         socket_handle {
             sockfd: x
         }
     }
-
 }

src/test/auxiliary/issue_2316_b.rs

@@ -10,18 +10,12 @@
 
 extern mod issue_2316_a;
 
-mod cloth {
+pub mod cloth {
-    #[legacy_exports];
+    use issue_2316_a::*;
-
-use issue_2316_a::*;
-
-export calico, gingham, flannel;
-export fabric;
-
-enum fabric {
-  gingham, flannel, calico
-}
 
+    pub enum fabric {
+        gingham, flannel, calico
+    }
 }
 
 

src/test/auxiliary/issue_2723_a.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[legacy_exports];
+pub unsafe fn f(xs: ~[int]) {
-unsafe fn f(xs: ~[int]) {
+    xs.map(|_x| { unsafe fn q() { fail; } });
-  xs.map(|_x| { unsafe fn q() { fail; } });
+}
-}

src/test/bench/shootout-nbody.rs

@@ -22,8 +22,7 @@ use core::os;
 // an llvm intrinsic.
 #[nolink]
 extern mod libc {
-    #[legacy_exports];
+    pub fn sqrt(n: float) -> float;
-    fn sqrt(n: float) -> float;
 }
 
 fn main() {

src/test/compile-fail/attr-bad-meta.rs

@@ -12,5 +12,4 @@
 
 // asterisk is bogus
 #[attr*]
-mod m {
+mod m {}
-    #[legacy_exports]; }

src/test/compile-fail/bad-expr-path.rs

@@ -10,7 +10,6 @@
 
 // error-pattern: unresolved name: m1::a
 
-mod m1 {
+mod m1 {}
-    #[legacy_exports]; }
 
 fn main(args: ~[str]) { log(debug, m1::a); }

src/test/compile-fail/bad-expr-path2.rs

@@ -11,9 +11,7 @@
 // error-pattern: unresolved name: m1::a
 
 mod m1 {
-    #[legacy_exports];
+    pub mod a {}
-    mod a {
-        #[legacy_exports]; }
 }
 
 fn main(args: ~[str]) { log(debug, m1::a); }

src/test/compile-fail/crateresolve2.rs

@@ -16,8 +16,7 @@
 extern mod crateresolve2(vers = "0.1");
 
 mod m {
-    #[legacy_exports];
+    pub extern mod crateresolve2(vers = "0.2");
-    extern mod crateresolve2(vers = "0.2");
 }
 
 fn main() {

src/test/compile-fail/empty-linkname.rs

@@ -12,5 +12,4 @@
 
 #[link_name = ""]
 extern mod foo {
-    #[legacy_exports];
 }

src/test/compile-fail/empty-linkname2.rs

@@ -14,5 +14,4 @@
 #[link_name = ""]
 #[nolink]
 extern mod foo {
-    #[legacy_exports];
 }

src/test/compile-fail/export-fully-qualified.rs

@@ -15,11 +15,7 @@
 // want to change eventually.
 
 mod foo {
-    #[legacy_exports];
+    pub fn bar() { foo::baz(); }
-
-    export bar;
-
-    fn bar() { foo::baz(); }
 
     fn baz() { }
 }

src/test/compile-fail/export-import.rs

@@ -13,10 +13,7 @@
 use m::unexported;
 
 mod m {
-    #[legacy_exports];
+    pub fn exported() { }
-    export exported;
-
-    fn exported() { }
 
     fn unexported() { }
 }

src/test/compile-fail/export-tag-variant.rs

@@ -11,10 +11,7 @@
 // error-pattern: unresolved name
 
 mod foo {
-    #[legacy_exports];
+    pub fn x() { }
-    export x;
-
-    fn x() { }
 
     enum y { y1, }
 }

src/test/compile-fail/export.rs

@@ -10,9 +10,7 @@
 
 // error-pattern: unresolved name
 mod foo {
-    #[legacy_exports];
+    pub fn x(y: int) { log(debug, y); }
-    export x;
-    fn x(y: int) { log(debug, y); }
     fn z(y: int) { log(debug, y); }
 }
 

src/test/compile-fail/export2.rs

@@ -11,19 +11,13 @@
 // error-pattern: unresolved name
 
 mod foo {
-    #[legacy_exports];
+    pub fn x() { bar::x(); }
-    export x;
-
-    fn x() { bar::x(); }
 }
 
 mod bar {
-    #[legacy_exports];
-    export y;
-
     fn x() { debug!("x"); }
 
-    fn y() { }
+    pub fn y() { }
 }
 
 fn main() { foo::x(); }

src/test/compile-fail/foreign-unsafe-fn-called.rs

@@ -12,8 +12,7 @@
 
 #[abi = "cdecl"]
 extern mod test {
-    #[legacy_exports];
+    pub unsafe fn free();
-    unsafe fn free();
 }
 
 fn main() {

src/test/compile-fail/foreign-unsafe-fn.rs

@@ -12,8 +12,7 @@
 
 #[abi = "cdecl"]
 extern mod test {
-    #[legacy_exports];
+    pub unsafe fn free();
-    unsafe fn free();
 }
 
 fn main() {

src/test/compile-fail/fully-qualified-type-name2.rs

@@ -11,13 +11,11 @@
 // Test that we use fully-qualified type names in error messages.
 
 mod x {
-    #[legacy_exports];
+    pub enum foo { }
-    enum foo { }
 }
 
 mod y {
-    #[legacy_exports];
+    pub enum foo { }
-    enum foo { }
 }
 
 fn bar(x: x::foo) -> y::foo {

src/test/compile-fail/import-from-missing.rs

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

src/test/compile-fail/import-from-rename.rs

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

src/test/compile-fail/import-glob-0.rs

@@ -13,15 +13,10 @@
 use module_of_many_things::*;
 
 mod module_of_many_things {
-    #[legacy_exports];
+    pub fn f1() { debug!("f1"); }
-    export f1;
+    pub fn f2() { debug!("f2"); }
-    export f2;
-    export f4;
-
-    fn f1() { debug!("f1"); }
-    fn f2() { debug!("f2"); }
     fn f3() { debug!("f3"); }
-    fn f4() { debug!("f4"); }
+    pub fn f4() { debug!("f4"); }
 }
 
 

src/test/compile-fail/import-glob-circular.rs

@@ -11,27 +11,18 @@
 // error-pattern: unresolved
 
 mod circ1 {
-    #[legacy_exports];
+    pub use circ2::f2;
-    use circ1::*;
+    pub fn f1() { debug!("f1"); }
-    export f1;
+    pub fn common() -> uint { return 0u; }
-    export f2;
-    export common;
-    fn f1() { debug!("f1"); }
-    fn common() -> uint { return 0u; }
 }
 
 mod circ2 {
-    #[legacy_exports];
+    pub use circ1::f1;
-    use circ2::*;
+    pub fn f2() { debug!("f2"); }
-    export f1;
+    pub fn common() -> uint { return 1u; }
-    export f2;
-    export common;
-    fn f2() { debug!("f2"); }
-    fn common() -> uint { return 1u; }
 }
 
 mod test {
-    #[legacy_exports];
     use circ1::*;
 
     fn test() { f1066(); }

src/test/compile-fail/import-glob-export.rs

@@ -1,23 +0,0 @@
-// 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.
-
-
-// error-pattern:unresolved name
-
-use m1::*;
-
-mod m1 {
-    #[legacy_exports];
-    export f1;
-    fn f1() { }
-    fn f2() { }
-}
-
-fn main() { f2(); }

src/test/compile-fail/import-glob-rename.rs

@@ -13,9 +13,8 @@
 use baz = foo::*;
 
 mod foo {
-    #[legacy_exports];
+    pub fn bar() {}
-    fn bar() {}
 }
 
 fn main() {
-}
+}

src/test/compile-fail/import-loop-2.rs

@@ -11,15 +11,11 @@
 // error-pattern:import
 
 mod a {
-    #[legacy_exports];
+    pub use b::x;
-    import b::x;
-    export x;
 }
 
 mod b {
-    #[legacy_exports];
+    pub use a::x;
-    import a::x;
-    export x;
 
     fn main() { let y = x; }
 }

src/test/compile-fail/import-loop.rs

@@ -13,9 +13,7 @@
 use y::x;
 
 mod y {
-    #[legacy_exports];
+    pub use y::x;
-    import x;
-    export x;
 }
 
 fn main() { }

src/test/compile-fail/import.rs

@@ -12,7 +12,6 @@
 use zed::bar;
 use zed::baz;
 mod zed {
-    #[legacy_exports];
+    pub fn bar() { debug!("bar"); }
-    fn bar() { debug!("bar"); }
 }
 fn main(args: ~[str]) { bar(); }

src/test/compile-fail/import2.rs

@@ -10,10 +10,8 @@
 
 // error-pattern: unresolved
 use baz::zed::bar;
-mod baz {
+mod baz {}
-    #[legacy_exports]; }
 mod zed {
-    #[legacy_exports];
+    pub fn bar() { debug!("bar3"); }
-    fn bar() { debug!("bar3"); }
 }
 fn main(args: ~[str]) { bar(); }

src/test/compile-fail/import4.rs

@@ -10,9 +10,7 @@
 
 // error-pattern: import
 
-mod a {
+mod a { pub use b::foo; }
-    #[legacy_exports]; import foo = b::foo; export foo; }
+mod b { pub use a::foo; }
-mod b {
-    #[legacy_exports]; import foo = a::foo; export foo; }
 
 fn main(args: ~[str]) { debug!("loop"); }

src/test/compile-fail/issue-1655.rs

@@ -10,7 +10,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

src/test/compile-fail/issue-2123.rs

@@ -11,7 +11,6 @@
 use x = m::f; //~ ERROR failed to resolve import
 
 mod m {
-    #[legacy_exports];
 }
 
 fn main() {

src/test/compile-fail/issue-2848.rs

@@ -9,8 +9,7 @@
 // except according to those terms.
 
 mod bar {
-    #[legacy_exports];
+    pub enum foo {
-    enum foo {
         alpha,
         beta,
         charlie

src/test/compile-fail/issue-2937.rs

@@ -12,7 +12,6 @@
 use x = m::f;
 
 mod m {
-    #[legacy_exports];
 }
 
 fn main() {

src/test/compile-fail/issue-3099-b.rs

@@ -8,10 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[legacy_exports]
+pub mod a {}
-mod a {}
 
-#[legacy_exports]
+pub mod a {} //~ ERROR duplicate definition of type a
-mod a {} //~ ERROR duplicate definition of type a
 
 fn main() {}

src/test/compile-fail/keyword.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[legacy_exports]
+pub mod break {
-mod break {
     //~^ ERROR found `break` in ident position
-}
+}

src/test/compile-fail/nolink-with-link-args.rs

@@ -16,7 +16,6 @@ the compiler output. */
 
 #[link_args = "aFdEfSeVEEE"]
 #[nolink]
-extern mod m1 {
+extern mod m1 {}
-    #[legacy_exports]; }
 
-fn main() { }
+fn main() { }

src/test/compile-fail/private-impl-method.rs

@@ -9,12 +9,11 @@
 // except according to those terms.
 
 mod a {
-    #[legacy_exports];
+    pub struct Foo {
-    struct Foo {
         x: int
     }
 
-    impl Foo {
+    pub impl Foo {
         priv fn foo() {}
     }
 }

src/test/compile-fail/private-item-simple.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 mod a {
-    #[legacy_exports];
     priv fn f() {}
 }
 

src/test/compile-fail/private-method.rs

@@ -11,24 +11,22 @@
 // error-pattern:method `nap` is private
 
 mod kitties {
-    #[legacy_exports];
+    pub struct cat {
-struct cat {
+        priv mut meows : uint,
-  priv mut meows : uint,
 
-  how_hungry : int,
+        how_hungry : int,
-
+    }
-}
+
-
+    pub impl cat {
-impl cat {
+        priv fn nap() { uint::range(1u, 10000u, |_i| false)}
-    priv fn nap() { uint::range(1u, 10000u, |_i| false)}
+    }
-}
+
-
+    pub fn cat(in_x : uint, in_y : int) -> cat {
-fn cat(in_x : uint, in_y : int) -> cat {
+        cat {
-    cat {
+            meows: in_x,
-        meows: in_x,
+            how_hungry: in_y
-        how_hungry: in_y
+        }
     }
-}
 }
 
 fn main() {

src/test/compile-fail/private-struct-field-ctor.rs

@@ -9,8 +9,7 @@
 // except according to those terms.
 
 mod a {
-    #[legacy_exports];
+    pub struct Foo {
-    struct Foo {
         priv x: int
     }
 }

src/test/compile-fail/private-struct-field-pattern.rs

@@ -11,12 +11,11 @@
 use a::Foo;
 
 mod a {
-    #[legacy_exports];
+    pub struct Foo {
-    struct Foo {
         priv x: int
     }
 
-    fn make() -> Foo {
+    pub fn make() -> Foo {
         Foo { x: 3 }
     }
 }

src/test/compile-fail/private-struct-field.rs

@@ -9,12 +9,11 @@
 // except according to those terms.
 
 mod cat {
-    #[legacy_exports];
+    pub struct Cat {
-    struct Cat {
         priv meows: uint
     }
 
-    fn new_cat() -> Cat {
+    pub fn new_cat() -> Cat {
         Cat { meows: 52 }
     }
 }

src/test/compile-fail/private-variant.rs

@@ -9,8 +9,7 @@
 // except according to those terms.
 
 mod a {
-    #[legacy_exports];
+    pub enum Waffle {
-    enum Waffle {
         Belgian,
         Brussels,
         priv Liege

src/test/compile-fail/redundant-link-args.rs

@@ -19,11 +19,9 @@
 #[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];
 }

src/test/compile-fail/regions-glb-free-free.rs

@@ -9,23 +9,22 @@
 // except according to those terms.
 
 mod argparse {
-    #[legacy_exports];
     extern mod std;
 
     use either::{Either, Left, Right};
 
-    struct Flag {
+    pub struct Flag {
         name: &str,
         desc: &str,
         max_count: uint,
         mut value: uint
     }
 
-    fn flag(name: &r/str, desc: &r/str) -> Flag/&r {
+    pub fn flag(name: &r/str, desc: &r/str) -> Flag/&r {
         Flag { name: name, desc: desc, max_count: 1, value: 0 }
     }
 
-    impl Flag {
+    pub impl Flag {
         fn set_desc(self, s: &str) -> Flag {
             Flag { //~ ERROR cannot infer an appropriate lifetime
                 name: self.name,

src/test/compile-fail/unused-imports-warn.rs

@@ -13,18 +13,15 @@
 use cal = bar::c::cc;
 
 mod foo {
-    #[legacy_exports];
+    pub type point = {x: int, y: int};
-    type point = {x: int, y: int};
+    pub type square = {p: point, h: uint, w: uint};
-    type square = {p: point, h: uint, w: uint};
 }
 
 mod bar {
-    #[legacy_exports];
+    pub mod c {
-    mod c {
-        #[legacy_exports];
         use foo::point;
         use foo::square;
-        fn cc(p: point) -> str { return 2 * (p.x + p.y); }
+        pub fn cc(p: point) -> str { return 2 * (p.x + p.y); }
     }
 }
 

src/test/compile-fail/warn-ctypes-err-attr.rs

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

src/test/compile-fail/warn-ctypes.rs

@@ -12,9 +12,8 @@
 // error-pattern:found rust type
 #[nolink]
 extern mod libc {
-    #[legacy_exports];
+    pub fn malloc(size: int) -> *u8;
-    fn malloc(size: int) -> *u8;
 }
 
 fn main() {
-}
+}

src/test/compile-fail/warn-foreign-int-types.rs

@@ -10,9 +10,8 @@
 
 //error-pattern:libc::c_int or libc::c_long should be used
 extern mod xx {
-    #[legacy_exports];
+    pub fn strlen(str: *u8) -> uint;
-  fn strlen(str: *u8) -> uint;
+    pub fn foo(x: int, y: uint);
-  fn foo(x: int, y: uint);
 }
 
 fn main() {

src/test/run-fail/extern-fail.rs

@@ -13,9 +13,8 @@
 // Instead the failure will be delivered after the callbacks return.
 
 extern mod rustrt {
-    #[legacy_exports];
+    pub fn rust_dbg_call(cb: *u8,
-    fn rust_dbg_call(cb: *u8,
+                         data: libc::uintptr_t) -> libc::uintptr_t;
-                     data: libc::uintptr_t) -> libc::uintptr_t;
 }
 
 extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {

src/test/run-fail/morestack2.rs

@@ -18,8 +18,7 @@
 extern mod std;
 
 extern mod rustrt {
-    #[legacy_exports];
+    pub fn last_os_error() -> ~str;
-    fn last_os_error() -> ~str;
 }
 
 fn getbig_call_c_and_fail(i: int) {

src/test/run-fail/run-unexported-tests.rs

@@ -14,10 +14,7 @@
 extern mod std;
 
 mod m {
-    #[legacy_exports];
+    pub fn exported() { }
-    export exported;
-
-    fn exported() { }
 
     #[test]
     fn unexported() { fail ~"runned an unexported test"; }