---

yaml
---
r: 44836
b: refs/heads/master
c: 78d5091
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2df07ddc250b64151401e9b8569a6c7ad5c9b34f
+refs/heads/master: 78d5091a4f09f0f7c613437e502db95b63a0c538
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/doc/tutorial.md

@@ -2304,10 +2304,11 @@ mod farm {
         farmer: Human
     }
 
+    // Note - visibility modifiers on impls currently have no effect
     impl Farm {
         priv fn feed_chickens(&self) { ... }
         priv fn feed_cows(&self) { ... }
-        pub fn add_chicken(&self, c: Chicken) { ... }
+        fn add_chicken(&self, c: Chicken) { ... }
     }
 
     pub fn feed_animals(farm: &Farm) {

trunk/src/libcore/cell.rs

@@ -28,7 +28,7 @@ pub pure fn empty_cell<T>() -> Cell<T> {
     Cell { value: None }
 }
 
-pub impl<T> Cell<T> {
+impl<T> Cell<T> {
     /// Yields the value, failing if the cell is empty.
     fn take() -> T {
         if self.is_empty() {

trunk/src/libcore/comm.rs

@@ -190,7 +190,7 @@ pub fn PortSet<T: Owned>() -> PortSet<T>{
     }
 }
 
-pub impl<T: Owned> PortSet<T> {
+impl<T: Owned> PortSet<T> {
 
     fn add(port: Port<T>) {
         self.ports.push(port)
@@ -323,12 +323,12 @@ pub fn oneshot<T: Owned>() -> (PortOne<T>, ChanOne<T>) {
     (port, chan)
 }
 
-pub impl<T: Owned> PortOne<T> {
+impl<T: Owned> PortOne<T> {
     fn recv(self) -> T { recv_one(self) }
     fn try_recv(self) -> Option<T> { try_recv_one(self) }
 }
 
-pub impl<T: Owned> ChanOne<T> {
+impl<T: Owned> ChanOne<T> {
     fn send(self, data: T) { send_one(self, data) }
     fn try_send(self, data: T) -> bool { try_send_one(self, data) }
 }

trunk/src/libcore/condition.rs

@@ -25,7 +25,7 @@ pub struct Condition<T, U> {
     key: task::local_data::LocalDataKey<Handler<T, U>>
 }
 
-pub impl<T, U> Condition<T, U> {
+impl<T, U> Condition<T, U> {
     fn trap(&self, h: &self/fn(T) -> U) -> Trap/&self<T, U> {
         unsafe {
             let p : *RustClosure = ::cast::transmute(&h);
@@ -69,7 +69,7 @@ struct Trap<T, U> {
     handler: @Handler<T, U>
 }
 
-pub impl<T, U> Trap<T, U> {
+impl<T, U> Trap<T, U> {
     fn in<V>(&self, inner: &self/fn() -> V) -> V {
         unsafe {
             let _g = Guard { cond: self.cond };

trunk/src/libcore/dlist.rs

@@ -62,7 +62,7 @@ priv impl<T> DListNode<T> {
     }
 }
 
-pub impl<T> DListNode<T> {
+impl<T> DListNode<T> {
     /// Get the next node in the list, if there is one.
     pure fn next_link(@mut self) -> DListLink<T> {
         self.assert_links();
@@ -208,7 +208,7 @@ priv impl<T> DList<T> {
     }
 }
 
-pub impl<T> DList<T> {
+impl<T> DList<T> {
     /// Get the size of the list. O(1).
     pure fn len(@mut self) -> uint { self.size }
     /// Returns true if the list is empty. O(1).
@@ -457,7 +457,7 @@ pub impl<T> DList<T> {
     }
 }
 
-pub impl<T:Copy> DList<T> {
+impl<T:Copy> DList<T> {
     /// Remove data from the head of the list. O(1).
     fn pop(@mut self) -> Option<T> {
         self.pop_n().map(|nobe| nobe.data)

trunk/src/libcore/dvec.rs

@@ -92,6 +92,17 @@ priv impl<A> DVec<A> {
         }
     }
 
+    #[inline(always)]
+    fn check_out<B>(f: &fn(v: ~[A]) -> B) -> B {
+        unsafe {
+            let mut data = cast::reinterpret_cast(&null::<()>());
+            data <-> self.data;
+            let data_ptr: *() = cast::reinterpret_cast(&data);
+            if data_ptr.is_null() { fail!(~"Recursive use of dvec"); }
+            return f(data);
+        }
+    }
+
     #[inline(always)]
     fn give_back(data: ~[A]) {
         unsafe {
@@ -106,19 +117,7 @@ priv impl<A> DVec<A> {
 // In theory, most everything should work with any A, but in practice
 // almost nothing works without the copy bound due to limitations
 // around closures.
-pub impl<A> DVec<A> {
-    // FIXME (#3758): This should not need to be public.
-    #[inline(always)]
-    fn check_out<B>(f: &fn(v: ~[A]) -> B) -> B {
-        unsafe {
-            let mut data = cast::reinterpret_cast(&null::<()>());
-            data <-> self.data;
-            let data_ptr: *() = cast::reinterpret_cast(&data);
-            if data_ptr.is_null() { fail!(~"Recursive use of dvec"); }
-            return f(data);
-        }
-    }
-
+impl<A> DVec<A> {
     /// Reserves space for N elements
     fn reserve(count: uint) {
         vec::reserve(&mut self.data, count)
@@ -216,7 +215,7 @@ pub impl<A> DVec<A> {
     }
 }
 
-pub impl<A:Copy> DVec<A> {
+impl<A:Copy> DVec<A> {
     /**
      * Append all elements of a vector to the end of the list
      *

trunk/src/libcore/hashmap.rs

@@ -10,12 +10,14 @@
 
 //! Sendable hash maps.
 
+use container::{Container, Mutable, Map, Set};
+use cmp::Eq;
+use hash::Hash;
+use to_bytes::IterBytes;
+
 /// Open addressing with linear probing.
 pub mod linear {
-    use container::{Container, Mutable, Map, Set};
-    use cmp::Eq;
-    use hash::Hash;
-    use to_bytes::IterBytes;
+    use super::*;
     use iter::BaseIter;
     use hash::Hash;
     use iter;
@@ -750,8 +752,7 @@ mod test_map {
 
 #[test]
 mod test_set {
-    use hashmap::linear;
-    use container::{Container, Mutable, Map, Set};
+    use super::*;
     use vec;
 
     #[test]

trunk/src/libcore/mutable.rs

@@ -43,7 +43,7 @@ pub fn unwrap<T>(m: Mut<T>) -> T {
     value
 }
 
-pub impl<T> Data<T> {
+impl<T> Data<T> {
     fn borrow_mut<R>(op: &fn(t: &mut T) -> R) -> R {
         match self.mode {
             Immutable => fail!(fmt!("%? currently immutable",

trunk/src/libcore/option.rs

@@ -281,7 +281,7 @@ pub pure fn expect<T>(opt: Option<T>, reason: &str) -> T {
     }
 }
 
-pub impl<T> Option<T> {
+impl<T> Option<T> {
     /// Returns true if the option equals `none`
     #[inline(always)]
     pure fn is_none(&self) -> bool { is_none(self) }
@@ -393,7 +393,7 @@ pub impl<T> Option<T> {
     pure fn expect(self, reason: &str) -> T { expect(self, reason) }
 }
 
-pub impl<T:Copy> Option<T> {
+impl<T:Copy> Option<T> {
     /**
     Gets the value out of an option
 
@@ -421,7 +421,7 @@ pub impl<T:Copy> Option<T> {
     }
 }
 
-pub impl<T:Copy + Zero> Option<T> {
+impl<T:Copy + Zero> Option<T> {
     #[inline(always)]
     pure fn get_or_zero(self) -> T { get_or_zero(self) }
 }

trunk/src/libcore/os.rs

@@ -1021,10 +1021,10 @@ extern {
 pub mod consts {
 
     #[cfg(unix)]
-    pub use os::consts::unix::*;
+    use os::consts::unix::*;
 
     #[cfg(windows)]
-    pub use os::consts::windows::*;
+    use os::consts::windows::*;
 
     pub mod unix {
         pub const FAMILY: &str = "unix";
@@ -1035,19 +1035,19 @@ pub mod consts {
     }
 
     #[cfg(target_os = "macos")]
-    pub use os::consts::macos::*;
+    use os::consts::macos::*;
 
     #[cfg(target_os = "freebsd")]
-    pub use os::consts::freebsd::*;
+    use os::consts::freebsd::*;
 
     #[cfg(target_os = "linux")]
-    pub use os::consts::linux::*;
+    use os::consts::linux::*;
 
     #[cfg(target_os = "android")]
-    pub use os::consts::android::*;
+    use os::consts::android::*;
 
     #[cfg(target_os = "win32")]
-    pub use os::consts::win32::*;
+    use os::consts::win32::*;
 
     pub mod macos {
         pub const SYSNAME: &str = "macos";
@@ -1086,13 +1086,13 @@ pub mod consts {
 
 
     #[cfg(target_arch = "x86")]
-    pub use os::consts::x86::*;
+    use os::consts::x86::*;
 
     #[cfg(target_arch = "x86_64")]
-    pub use os::consts::x86_64::*;
+    use os::consts::x86_64::*;
 
     #[cfg(target_arch = "arm")]
-    pub use os::consts::arm::*;
+    use os::consts::arm::*;
 
     pub mod x86 {
         pub const ARCH: &str = "x86";

trunk/src/libcore/path.rs

@@ -241,7 +241,7 @@ mod stat {
 }
 
 
-pub impl Path {
+impl Path {
     fn stat(&self) -> Option<libc::stat> {
         unsafe {
              do str::as_c_str(self.to_str()) |buf| {
@@ -290,7 +290,7 @@ pub impl Path {
 #[cfg(target_os = "freebsd")]
 #[cfg(target_os = "linux")]
 #[cfg(target_os = "macos")]
-pub impl Path {
+impl Path {
     fn get_atime(&self) -> Option<(i64, int)> {
         match self.stat() {
             None => None,
@@ -324,7 +324,7 @@ pub impl Path {
 
 #[cfg(target_os = "freebsd")]
 #[cfg(target_os = "macos")]
-pub impl Path {
+impl Path {
     fn get_birthtime(&self) -> Option<(i64, int)> {
         match self.stat() {
             None => None,
@@ -337,7 +337,7 @@ pub impl Path {
 }
 
 #[cfg(target_os = "win32")]
-pub impl Path {
+impl Path {
     fn get_atime(&self) -> Option<(i64, int)> {
         match self.stat() {
             None => None,

trunk/src/libcore/pipes.rs

@@ -800,7 +800,7 @@ pub fn SendPacketBuffered<T,Tbuffer>(p: *Packet<T>)
     }
 }
 
-pub impl<T,Tbuffer> SendPacketBuffered<T,Tbuffer> {
+impl<T,Tbuffer> SendPacketBuffered<T,Tbuffer> {
     fn unwrap() -> *Packet<T> {
         let mut p = None;
         p <-> self.p;
@@ -857,7 +857,7 @@ impl<T:Owned,Tbuffer:Owned> ::ops::Drop for RecvPacketBuffered<T,Tbuffer> {
     }
 }
 
-pub impl<T:Owned,Tbuffer:Owned> RecvPacketBuffered<T, Tbuffer> {
+impl<T:Owned,Tbuffer:Owned> RecvPacketBuffered<T, Tbuffer> {
     fn unwrap() -> *Packet<T> {
         let mut p = None;
         p <-> self.p;