---

yaml
---
r: 95148
b: refs/heads/dist-snap
c: 019b131
h: refs/heads/master
v: v3

Author: sfackler

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: ccd9a963f75074da506c05fece1e3c965e742c51
+refs/heads/dist-snap: 019b131e12f49f1953a52865c1f19b025c73c06e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libextra/time.rs

@@ -788,6 +788,7 @@ fn do_strftime(format: &str, tm: &Tm) -> ~str {
     }
 
     fn parse_type(ch: char, tm: &Tm) -> ~str {
+        //FIXME (#2350): Implement missing types.
       let die = || format!("strftime: can't understand this format {} ", ch);
         match ch {
           'A' => match tm.tm_wday as int {
@@ -919,9 +920,10 @@ fn do_strftime(format: &str, tm: &Tm) -> ~str {
                 parse_type('b', tm),
                 parse_type('Y', tm))
           }
-          'W' => format!("{:02d}", (tm.tm_yday - (tm.tm_wday - 1 + 7) % 7 + 7)
-                         / 7),
+          //'W' {}
           'w' => (tm.tm_wday as int).to_str(),
+          //'X' {}
+          //'x' {}
           'Y' => (tm.tm_year as int + 1900).to_str(),
           'y' => format!("{:02d}", (tm.tm_year as int + 1900) % 100),
           'Z' => tm.tm_zone.clone(),
@@ -932,7 +934,7 @@ fn do_strftime(format: &str, tm: &Tm) -> ~str {
             m -= h * 60_i32;
             format!("{}{:02d}{:02d}", sign, h, m)
           }
-          '+' => tm.rfc3339(),
+          //'+' {}
           '%' => ~"%",
           _   => die()
         }
@@ -1295,13 +1297,12 @@ mod tests {
         assert_eq!(local.strftime("%u"), ~"5");
         assert_eq!(local.strftime("%V"), ~"07");
         assert_eq!(local.strftime("%v"), ~"13-Feb-2009");
-        assert_eq!(local.strftime("%W"), ~"06");
+        // assert!(local.strftime("%W") == "06");
         assert_eq!(local.strftime("%w"), ~"5");
-        assert_eq!(local.strftime("%X"), ~"15:31:30"); // FIXME (#2350): support locale
-        assert_eq!(local.strftime("%x"), ~"02/13/09"); // FIXME (#2350): support locale
+        // handle "%X"
+        // handle "%x"
         assert_eq!(local.strftime("%Y"), ~"2009");
         assert_eq!(local.strftime("%y"), ~"09");
-        assert_eq!(local.strftime("%+"), ~"2009-02-13T15:31:30-08:00");
 
         // FIXME (#2350): We should probably standardize on the timezone
         // abbreviation.

branches/dist-snap/src/libstd/rt/io/native/file.rs

@@ -17,8 +17,9 @@ use libc::{c_int, FILE};
 #[allow(non_camel_case_types)]
 pub type fd_t = c_int;
 
-// Make this a newtype so we can't do I/O on arbitrary integers
-pub struct FileDesc(fd_t);
+pub struct FileDesc {
+    priv fd: fd_t
+}
 
 impl FileDesc {
     /// Create a `FileDesc` from an open C file descriptor.
@@ -46,7 +47,9 @@ impl Seek for FileDesc {
     fn seek(&mut self, _pos: i64, _style: SeekStyle) { fail2!() }
 }
 
-pub struct CFile(*FILE);
+pub struct CFile {
+    priv file: *FILE
+}
 
 impl CFile {
     /// Create a `CFile` from an open `FILE` pointer.

branches/dist-snap/src/libstd/rt/io/net/tcp.rs

@@ -20,11 +20,13 @@ use rt::rtio::{IoFactory, IoFactoryObject,
                RtioTcpStream, RtioTcpStreamObject};
 use rt::local::Local;
 
-pub struct TcpStream(~RtioTcpStreamObject);
+pub struct TcpStream {
+    priv obj: ~RtioTcpStreamObject
+}
 
 impl TcpStream {
     fn new(s: ~RtioTcpStreamObject) -> TcpStream {
-        TcpStream(s)
+        TcpStream { obj: s }
     }
 
     pub fn connect(addr: SocketAddr) -> Option<TcpStream> {
@@ -46,7 +48,7 @@ impl TcpStream {
     }
 
     pub fn peer_name(&mut self) -> Option<SocketAddr> {
-        match (**self).peer_name() {
+        match self.obj.peer_name() {
             Ok(pn) => Some(pn),
             Err(ioerr) => {
                 rtdebug!("failed to get peer name: {:?}", ioerr);
@@ -57,7 +59,7 @@ impl TcpStream {
     }
 
     pub fn socket_name(&mut self) -> Option<SocketAddr> {
-        match (**self).socket_name() {
+        match self.obj.socket_name() {
             Ok(sn) => Some(sn),
             Err(ioerr) => {
                 rtdebug!("failed to get socket name: {:?}", ioerr);
@@ -70,7 +72,7 @@ impl TcpStream {
 
 impl Reader for TcpStream {
     fn read(&mut self, buf: &mut [u8]) -> Option<uint> {
-        match (**self).read(buf) {
+        match self.obj.read(buf) {
             Ok(read) => Some(read),
             Err(ioerr) => {
                 // EOF is indicated by returning None
@@ -87,7 +89,7 @@ impl Reader for TcpStream {
 
 impl Writer for TcpStream {
     fn write(&mut self, buf: &[u8]) {
-        match (**self).write(buf) {
+        match self.obj.write(buf) {
             Ok(_) => (),
             Err(ioerr) => io_error::cond.raise(ioerr),
         }
@@ -96,7 +98,9 @@ impl Writer for TcpStream {
     fn flush(&mut self) { /* no-op */ }
 }
 
-pub struct TcpListener(~RtioTcpListenerObject);
+pub struct TcpListener {
+    priv obj: ~RtioTcpListenerObject
+}
 
 impl TcpListener {
     pub fn bind(addr: SocketAddr) -> Option<TcpListener> {
@@ -105,7 +109,7 @@ impl TcpListener {
             (*io).tcp_bind(addr)
         };
         match listener {
-            Ok(l) => Some(TcpListener(l)),
+            Ok(l) => Some(TcpListener { obj: l }),
             Err(ioerr) => {
                 io_error::cond.raise(ioerr);
                 return None;
@@ -114,7 +118,7 @@ impl TcpListener {
     }
 
     pub fn socket_name(&mut self) -> Option<SocketAddr> {
-        match (**self).socket_name() {
+        match self.obj.socket_name() {
             Ok(sn) => Some(sn),
             Err(ioerr) => {
                 rtdebug!("failed to get socket name: {:?}", ioerr);
@@ -127,8 +131,8 @@ impl TcpListener {
 
 impl Listener<TcpStream, TcpAcceptor> for TcpListener {
     fn listen(self) -> Option<TcpAcceptor> {
-        match (**self).listen() {
-            Ok(acceptor) => Some(TcpAcceptor(acceptor)),
+        match self.obj.listen() {
+            Ok(acceptor) => Some(TcpAcceptor { obj: acceptor }),
             Err(ioerr) => {
                 io_error::cond.raise(ioerr);
                 None
@@ -137,11 +141,13 @@ impl Listener<TcpStream, TcpAcceptor> for TcpListener {
     }
 }
 
-pub struct TcpAcceptor(~RtioTcpAcceptorObject);
+pub struct TcpAcceptor {
+    priv obj: ~RtioTcpAcceptorObject
+}
 
 impl Acceptor<TcpStream> for TcpAcceptor {
     fn accept(&mut self) -> Option<TcpStream> {
-        match (**self).accept() {
+        match self.obj.accept() {
             Ok(s) => Some(TcpStream::new(s)),
             Err(ioerr) => {
                 io_error::cond.raise(ioerr);

branches/dist-snap/src/libstd/rt/io/net/udp.rs

@@ -16,7 +16,9 @@ use rt::io::{io_error, read_error, EndOfFile};
 use rt::rtio::{RtioSocket, RtioUdpSocketObject, RtioUdpSocket, IoFactory, IoFactoryObject};
 use rt::local::Local;
 
-pub struct UdpSocket(~RtioUdpSocketObject);
+pub struct UdpSocket {
+    priv obj: ~RtioUdpSocketObject
+}
 
 impl UdpSocket {
     pub fn bind(addr: SocketAddr) -> Option<UdpSocket> {
@@ -25,7 +27,7 @@ impl UdpSocket {
             (*factory).udp_bind(addr)
         };
         match socket {
-            Ok(s) => Some(UdpSocket(s)),
+            Ok(s) => Some(UdpSocket { obj: s }),
             Err(ioerr) => {
                 io_error::cond.raise(ioerr);
                 None
@@ -34,7 +36,7 @@ impl UdpSocket {
     }
 
     pub fn recvfrom(&mut self, buf: &mut [u8]) -> Option<(uint, SocketAddr)> {
-        match (**self).recvfrom(buf) {
+        match self.obj.recvfrom(buf) {
             Ok((nread, src)) => Some((nread, src)),
             Err(ioerr) => {
                 // EOF is indicated by returning None
@@ -47,7 +49,7 @@ impl UdpSocket {
     }
 
     pub fn sendto(&mut self, buf: &[u8], dst: SocketAddr) {
-        match (**self).sendto(buf, dst) {
+        match self.obj.sendto(buf, dst) {
             Ok(_) => (),
             Err(ioerr) => io_error::cond.raise(ioerr),
         }
@@ -58,7 +60,7 @@ impl UdpSocket {
     }
 
     pub fn socket_name(&mut self) -> Option<SocketAddr> {
-        match (***self).socket_name() {
+        match self.obj.socket_name() {
             Ok(sn) => Some(sn),
             Err(ioerr) => {
                 rtdebug!("failed to get socket name: {:?}", ioerr);
@@ -70,8 +72,8 @@ impl UdpSocket {
 }
 
 pub struct UdpStream {
-    socket: UdpSocket,
-    connectedTo: SocketAddr
+    priv socket: UdpSocket,
+    priv connectedTo: SocketAddr
 }
 
 impl UdpStream {

branches/dist-snap/src/libstd/rt/io/pipe.rs

@@ -20,7 +20,12 @@ use rt::local::Local;
 use rt::rtio::{RtioPipe, RtioPipeObject, IoFactoryObject, IoFactory};
 use rt::rtio::RtioUnboundPipeObject;
 
-pub struct PipeStream(RtioPipeObject);
+pub struct PipeStream {
+    priv obj: RtioPipeObject
+}
+
+// This should not be a newtype, but rt::uv::process::set_stdio needs to reach
+// into the internals of this :(
 pub struct UnboundPipeStream(~RtioUnboundPipeObject);
 
 impl PipeStream {
@@ -41,13 +46,13 @@ impl PipeStream {
     }
 
     pub fn bind(inner: RtioPipeObject) -> PipeStream {
-        PipeStream(inner)
+        PipeStream { obj: inner }
     }
 }
 
 impl Reader for PipeStream {
     fn read(&mut self, buf: &mut [u8]) -> Option<uint> {
-        match (**self).read(buf) {
+        match self.obj.read(buf) {
             Ok(read) => Some(read),
             Err(ioerr) => {
                 // EOF is indicated by returning None
@@ -64,7 +69,7 @@ impl Reader for PipeStream {
 
 impl Writer for PipeStream {
     fn write(&mut self, buf: &[u8]) {
-        match (**self).write(buf) {
+        match self.obj.write(buf) {
             Ok(_) => (),
             Err(ioerr) => {
                 io_error::cond.raise(ioerr);

branches/dist-snap/src/libstd/rt/io/timer.rs

@@ -15,7 +15,9 @@ use rt::rtio::{IoFactory, IoFactoryObject,
                RtioTimer, RtioTimerObject};
 use rt::local::Local;
 
-pub struct Timer(~RtioTimerObject);
+pub struct Timer {
+    priv obj: ~RtioTimerObject
+}
 
 /// Sleep the current task for `msecs` milliseconds.
 pub fn sleep(msecs: u64) {
@@ -34,7 +36,7 @@ impl Timer {
             (*io).timer_init()
         };
         match timer {
-            Ok(t) => Some(Timer(t)),
+            Ok(t) => Some(Timer { obj: t }),
             Err(ioerr) => {
                 rtdebug!("Timer::init: failed to init: {:?}", ioerr);
                 io_error::cond.raise(ioerr);
@@ -44,7 +46,7 @@ impl Timer {
     }
 
     pub fn sleep(&mut self, msecs: u64) {
-        (**self).sleep(msecs);
+        self.obj.sleep(msecs);
     }
 }
 

branches/dist-snap/src/libstd/str.rs

@@ -105,7 +105,6 @@ use option::{None, Option, Some};
 use ptr;
 use ptr::RawPtr;
 use to_str::ToStr;
-use from_str::FromStr;
 use uint;
 use vec;
 use vec::{OwnedVector, OwnedCopyableVector, ImmutableVector, MutableVector};
@@ -205,11 +204,6 @@ impl ToStr for ~str {
     fn to_str(&self) -> ~str { self.to_owned() }
 }
 
-impl FromStr for ~str {
-    #[inline]
-    fn from_str(s: &str) -> Option<~str> { Some(s.to_owned()) }
-}
-
 impl<'self> ToStr for &'self str {
     #[inline]
     fn to_str(&self) -> ~str { self.to_owned() }
@@ -220,11 +214,6 @@ impl ToStr for @str {
     fn to_str(&self) -> ~str { self.to_owned() }
 }
 
-impl<'self> FromStr for @str {
-    #[inline]
-    fn from_str(s: &str) -> Option<@str> { Some(s.to_managed()) }
-}
-
 /// Convert a byte to a UTF-8 string
 ///
 /// # Failure
@@ -2591,14 +2580,13 @@ impl Default for @str {
 #[cfg(test)]
 mod tests {
     use container::Container;
-    use option::{None, Some, Option};
+    use option::{None, Some};
     use ptr;
     use str::*;
     use vec;
     use vec::{Vector, ImmutableVector, CopyableVector};
     use cmp::{TotalOrd, Less, Equal, Greater};
     use send_str::{SendStrOwned, SendStrStatic};
-    use from_str::from_str;
 
     #[test]
     fn test_eq() {
@@ -3901,14 +3889,6 @@ mod tests {
         assert_eq!("abcde".to_send_str(), SendStrStatic("abcde"));
         assert_eq!("abcde".to_send_str(), SendStrOwned(~"abcde"));
     }
-
-    #[test]
-    fn test_from_str() {
-      let owned: Option<~str> = from_str(&"string");
-      assert_eq!(owned, Some(~"string"));
-      let managed: Option<@str> = from_str(&"string");
-      assert_eq!(managed, Some(@"string"));
-    }
 }
 
 #[cfg(test)]

branches/dist-snap/src/test/run-pass/rtio-processes.rs

@@ -84,7 +84,7 @@ fn read_all(input: &mut Reader) -> ~str {
     let mut buf = [0, ..1024];
     loop {
         match input.read(buf) {
-            None | Some(0) => { break }
+            None => { break }
             Some(n) => { ret = ret + str::from_utf8(buf.slice_to(n)); }
         }
     }