---

yaml
---
r: 39623
b: refs/heads/incoming
c: f67c372
h: refs/heads/master
i:
  39621: fede50f
  39619: 6c95e29
  39615: ffe62f5
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 4e07a6385d2e170da905acc77871024e3fa06b90
+refs/heads/incoming: f67c37263e9dd625ab7f91c661464b5f14a584af
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/auxiliary/cci_capture_clause.rs

@@ -8,13 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[legacy_exports];
-
-export foo;
-
 use core::oldcomm::*;
 
-fn foo<T: Owned Copy>(x: T) -> Port<T> {
+pub fn foo<T: Owned Copy>(x: T) -> Port<T> {
     let p = Port();
     let c = Chan(&p);
     do task::spawn() |copy c, copy x| {

branches/incoming/src/test/auxiliary/cci_class_cast.rs

@@ -14,15 +14,13 @@ use to_str::*;
 use to_str::ToStr;
 
 mod kitty {
-    #[legacy_exports];
-
-struct cat {
-  priv mut meows : uint,
-  mut how_hungry : int,
-  name : ~str,
-}
+    pub struct cat {
+      priv mut meows : uint,
+      mut how_hungry : int,
+      name : ~str,
+    }
 
-    impl cat : ToStr {
+    pub impl cat : ToStr {
        pure fn to_str() -> ~str { copy self.name }
     }
 
@@ -37,7 +35,7 @@ struct cat {
 
     }
 
-    impl cat {
+    pub impl cat {
         fn speak() { self.meow(); }
 
         fn eat() -> bool {
@@ -52,14 +50,14 @@ struct cat {
             }
         }
     }
-fn cat(in_x : uint, in_y : int, in_name: ~str) -> cat {
-    cat {
-        meows: in_x,
-        how_hungry: in_y,
-        name: in_name
-    }
-}
 
+    pub fn cat(in_x : uint, in_y : int, in_name: ~str) -> cat {
+        cat {
+            meows: in_x,
+            how_hungry: in_y,
+            name: in_name
+        }
+    }
 }
 
 

branches/incoming/src/test/auxiliary/issue-2631-a.rs

@@ -10,17 +10,15 @@
 
 #[link(name = "req")];
 #[crate_type = "lib"];
-#[legacy_exports];
 
 extern mod std;
 
-use dvec::*;
-use dvec::DVec;
+use core::dvec::*;
 use std::map::HashMap;
 
-type header_map = HashMap<~str, @DVec<@~str>>;
+pub type header_map = HashMap<~str, @DVec<@~str>>;
 
 // the unused ty param is necessary so this gets monomorphized
-fn request<T: Copy>(req: header_map) {
+pub fn request<T: Copy>(req: header_map) {
   let _x = copy *(copy *req.get(~"METHOD"))[0u];
 }

branches/incoming/src/test/auxiliary/static-methods-crate.rs

@@ -12,10 +12,8 @@
        vers = "0.1")];
 
 #[crate_type = "lib"];
-#[legacy_exports];
-export read, readMaybe;
 
-trait read {
+pub trait read {
     static fn readMaybe(s: ~str) -> Option<self>;
 }
 
@@ -35,7 +33,7 @@ impl bool: read {
     }
 }
 
-fn read<T: read Copy>(s: ~str) -> T {
+pub fn read<T: read Copy>(s: ~str) -> T {
     match read::readMaybe(s) {
       Some(x) => x,
       _ => fail ~"read failed!"

branches/incoming/src/test/auxiliary/static_fn_inline_xc_aux.rs

@@ -16,7 +16,7 @@ pub mod num {
 }
 
 pub mod float {
-    impl float: num::Num2 {
+    impl float: ::num::Num2 {
         #[inline]
         static pure fn from_int2(n: int) -> float { return n as float;  }
     }

branches/incoming/src/test/auxiliary/static_fn_trait_xc_aux.rs

@@ -5,7 +5,7 @@ pub mod num {
 }
 
 pub mod float {
-    impl float: num::Num2 {
+    impl float: ::num::Num2 {
         static pure fn from_int2(n: int) -> float { return n as float;  }
     }
-}
+}

branches/incoming/src/test/auxiliary/test_comm.rs

@@ -13,12 +13,8 @@
 
   Could probably be more minimal.
  */
-#[legacy_exports];
 
-use libc::size_t;
-
-export port;
-export recv;
+use core::libc::size_t;
 
 
 /**
@@ -28,12 +24,12 @@ export recv;
  * transmitted. If a port value is copied, both copies refer to the same
  * port.  Ports may be associated with multiple `chan`s.
  */
-enum port<T: Owned> {
+pub enum port<T: Owned> {
     port_t(@port_ptr<T>)
 }
 
 /// Constructs a port
-fn port<T: Owned>() -> port<T> {
+pub fn port<T: Owned>() -> port<T> {
     port_t(@port_ptr(rustrt::new_port(sys::size_of::<T>() as size_t)))
 }
 
@@ -74,11 +70,11 @@ fn port_ptr<T: Owned>(po: *rust_port) -> port_ptr<T> {
  * Receive from a port.  If no data is available on the port then the
  * task will block until data becomes available.
  */
-fn recv<T: Owned>(p: port<T>) -> T { recv_((**p).po) }
+pub fn recv<T: Owned>(p: port<T>) -> T { recv_((**p).po) }
 
 
 /// Receive on a raw port pointer
-fn recv_<T: Owned>(p: *rust_port) -> T {
+pub fn recv_<T: Owned>(p: *rust_port) -> T {
     let yield = 0;
     let yieldp = ptr::addr_of(&yield);
     let mut res;

branches/incoming/src/test/run-pass/auto-encode.rs

@@ -26,12 +26,12 @@ use std::serialize::{Encodable, Decodable};
 use std::prettyprint;
 use std::time;
 
-fn test_prettyprint<A: Encodable<prettyprint::Encoder>>(
+fn test_prettyprint<A: Encodable<prettyprint::Serializer>>(
     a: &A,
     expected: &~str
 ) {
     let s = do io::with_str_writer |w| {
-        a.encode(&prettyprint::Encoder(w))
+        a.encode(&prettyprint::Serializer(w))
     };
     debug!("s == %?", s);
     assert s == *expected;

branches/incoming/src/test/run-pass/cci_capture_clause.rs

@@ -18,7 +18,7 @@
 
 extern mod cci_capture_clause;
 
-use oldcomm::recv;
+use core::oldcomm::recv;
 
 fn main() {
     cci_capture_clause::foo(()).recv()

branches/incoming/src/test/run-pass/class-separate-impl.rs

@@ -9,8 +9,7 @@
 // except according to those terms.
 
 // xfail-fast
-use to_str::*;
-use to_str::ToStr;
+use core::to_str::*;
 
 struct cat {
   priv mut meows : uint,

branches/incoming/src/test/run-pass/export-non-interference3.rs

@@ -9,17 +9,11 @@
 // except according to those terms.
 
 mod foo {
-    #[legacy_exports];
-    export x;
-
-    fn x() { bar::x(); }
+    pub fn x() { bar::x(); }
 }
 
 mod bar {
-    #[legacy_exports];
-    export x;
-
-    fn x() { debug!("x"); }
+    pub fn x() { debug!("x"); }
 }
 
 fn main() { foo::x(); }

branches/incoming/src/test/run-pass/hashmap-memory.rs

@@ -28,14 +28,12 @@ use oldcomm::recv;
 fn map(filename: ~str, emit: map_reduce::putter) { emit(filename, ~"1"); }
 
 mod map_reduce {
-    #[legacy_exports];
-    export putter;
-    export mapper;
-    export map_reduce;
+    use std::map;
+    use std::map::HashMap;
 
-    type putter = fn@(~str, ~str);
+    pub type putter = fn@(~str, ~str);
 
-    type mapper = extern fn(~str, putter);
+    pub type mapper = extern fn(~str, putter);
 
     enum ctrl_proto { find_reducer(~[u8], Chan<int>), mapper_done, }
 
@@ -70,7 +68,7 @@ mod map_reduce {
         send(ctrl, mapper_done);
     }
 
-    fn map_reduce(inputs: ~[~str]) {
+    pub fn map_reduce(inputs: ~[~str]) {
         let ctrl = Port();
 
         // This task becomes the master control task. It spawns others

branches/incoming/src/test/run-pass/import-glob-crate.rs

@@ -12,7 +12,7 @@
 
 
 extern mod std;
-use vec::*;
+use core::vec::*;
 
 fn main() {
     let mut v = from_elem(0u, 0);

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

@@ -21,26 +21,24 @@ extern mod rusti {
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
 mod m {
-    #[legacy_exports];
     #[cfg(target_arch = "x86")]
-    fn main() {
-        assert rusti::pref_align_of::<u64>() == 8u;
-        assert rusti::min_align_of::<u64>() == 4u;
+    pub fn main() {
+        assert ::rusti::pref_align_of::<u64>() == 8u;
+        assert ::rusti::min_align_of::<u64>() == 4u;
     }
 
     #[cfg(target_arch = "x86_64")]
-    fn main() {
-        assert rusti::pref_align_of::<u64>() == 8u;
-        assert rusti::min_align_of::<u64>() == 8u;
+    pub fn main() {
+        assert ::rusti::pref_align_of::<u64>() == 8u;
+        assert ::rusti::min_align_of::<u64>() == 8u;
     }
 }
 
 #[cfg(target_os = "win32")]
 mod m {
-    #[legacy_exports];
     #[cfg(target_arch = "x86")]
-    fn main() {
-        assert rusti::pref_align_of::<u64>() == 8u;
-        assert rusti::min_align_of::<u64>() == 8u;
+    pub fn main() {
+        assert ::rusti::pref_align_of::<u64>() == 8u;
+        assert ::rusti::min_align_of::<u64>() == 8u;
     }
 }

branches/incoming/src/test/run-pass/issue-2214.rs

@@ -10,8 +10,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use libc::{c_double, c_int};
-use f64::*;
+use core::cast;
+use core::libc::{c_double, c_int};
+use core::f64::*;
 
 fn to_c_int(v: &mut int) -> &mut c_int unsafe {
     cast::reinterpret_cast(&v)
@@ -24,13 +25,12 @@ fn lgamma(n: c_double, value: &mut int) -> c_double {
 #[link_name = "m"]
 #[abi = "cdecl"]
 extern mod m {
-    #[legacy_exports];
     #[cfg(unix)]
-    #[link_name="lgamma_r"] fn lgamma(n: c_double, sign: &mut c_int)
+    #[link_name="lgamma_r"] pub fn lgamma(n: c_double, sign: &mut c_int)
       -> c_double;
     #[cfg(windows)]
-    #[link_name="__lgamma_r"] fn lgamma(n: c_double,
-                                        sign: &mut c_int) -> c_double;
+    #[link_name="__lgamma_r"] pub fn lgamma(n: c_double,
+                                            sign: &mut c_int) -> c_double;
 
 }