---

yaml
---
r: 114551
b: refs/heads/master
c: 8c5a8e1
h: refs/heads/master
i:
  114549: c01e134
  114547: 674867a
  114543: 9a551ca
v: v3

Author: Sawyer47

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9659a509572106e4f7eaee7d87d993f56d33d8be
+refs/heads/master: 8c5a8e10b25fdd2e12de78f04d2f538a22776024
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
 refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17

trunk/configure

@@ -725,7 +725,6 @@ then
             if [ -z "$CC" ]
             then
                 CFG_CC="clang"
-                CFG_CXX="clang++"
             fi
             ;;
             (*)

trunk/src/libcore/mem.rs

@@ -160,9 +160,9 @@ pub unsafe fn overwrite<T>(dst: *mut T, src: T) {
     intrinsics::move_val_init(&mut *dst, src)
 }
 
-/// Deprecated, use `overwrite` instead
+/// Deprecated, use move_val_init() instead
 #[inline]
-#[deprecated = "this function has been renamed to `overwrite`"]
+#[deprecated = "this function has been renamed to move_val_init()"]
 pub unsafe fn move_val_init<T>(dst: &mut T, src: T) {
     overwrite(dst, src)
 }

trunk/src/libcore/str.rs

@@ -692,19 +692,19 @@ pub fn is_utf16(v: &[u16]) -> bool {
 /// An iterator that decodes UTF-16 encoded codepoints from a vector
 /// of `u16`s.
 #[deriving(Clone)]
-pub struct UTF16Items<'a> {
+pub struct Utf16Items<'a> {
     iter: slice::Items<'a, u16>
 }
 /// The possibilities for values decoded from a `u16` stream.
 #[deriving(Eq, TotalEq, Clone, Show)]
-pub enum UTF16Item {
+pub enum Utf16Item {
     /// A valid codepoint.
     ScalarValue(char),
     /// An invalid surrogate without its pair.
     LoneSurrogate(u16)
 }
 
-impl UTF16Item {
+impl Utf16Item {
     /// Convert `self` to a `char`, taking `LoneSurrogate`s to the
     /// replacement character (U+FFFD).
     #[inline]
@@ -716,8 +716,8 @@ impl UTF16Item {
     }
 }
 
-impl<'a> Iterator<UTF16Item> for UTF16Items<'a> {
-    fn next(&mut self) -> Option<UTF16Item> {
+impl<'a> Iterator<Utf16Item> for Utf16Items<'a> {
+    fn next(&mut self) -> Option<Utf16Item> {
         let u = match self.iter.next() {
             Some(u) => *u,
             None => return None
@@ -781,8 +781,8 @@ impl<'a> Iterator<UTF16Item> for UTF16Items<'a> {
 ///                 ScalarValue('i'), ScalarValue('c'),
 ///                 LoneSurrogate(0xD834)]);
 /// ```
-pub fn utf16_items<'a>(v: &'a [u16]) -> UTF16Items<'a> {
-    UTF16Items { iter : v.iter() }
+pub fn utf16_items<'a>(v: &'a [u16]) -> Utf16Items<'a> {
+    Utf16Items { iter : v.iter() }
 }
 
 /// Return a slice of `v` ending at (and not including) the first NUL

trunk/src/libgreen/context.rs

@@ -270,7 +270,7 @@ fn initialize_call_frame(regs: &mut Registers, fptr: InitFn, arg: uint,
 type Registers = [uint, ..32];
 
 #[cfg(target_arch = "mips")]
-fn new_regs() -> Box<Registers> { box {[0, .. 32]} }
+fn new_regs() -> Box<Registers> { box [0, .. 32] }
 
 #[cfg(target_arch = "mips")]
 fn initialize_call_frame(regs: &mut Registers, fptr: InitFn, arg: uint,

trunk/src/liblibc/lib.rs

@@ -2476,9 +2476,6 @@ pub mod consts {
         }
         pub mod posix08 {
         }
-        #[cfg(target_arch = "arm")]
-        #[cfg(target_arch = "x86")]
-        #[cfg(target_arch = "x86_64")]
         pub mod bsd44 {
             use types::os::arch::c95::c_int;
 
@@ -2521,49 +2518,6 @@ pub mod consts {
             pub static SHUT_WR: c_int = 1;
             pub static SHUT_RDWR: c_int = 2;
         }
-        #[cfg(target_arch = "mips")]
-        pub mod bsd44 {
-            use types::os::arch::c95::c_int;
-
-            pub static MADV_NORMAL : c_int = 0;
-            pub static MADV_RANDOM : c_int = 1;
-            pub static MADV_SEQUENTIAL : c_int = 2;
-            pub static MADV_WILLNEED : c_int = 3;
-            pub static MADV_DONTNEED : c_int = 4;
-            pub static MADV_REMOVE : c_int = 9;
-            pub static MADV_DONTFORK : c_int = 10;
-            pub static MADV_DOFORK : c_int = 11;
-            pub static MADV_MERGEABLE : c_int = 12;
-            pub static MADV_UNMERGEABLE : c_int = 13;
-            pub static MADV_HWPOISON : c_int = 100;
-
-            pub static AF_UNIX: c_int = 1;
-            pub static AF_INET: c_int = 2;
-            pub static AF_INET6: c_int = 10;
-            pub static SOCK_STREAM: c_int = 2;
-            pub static SOCK_DGRAM: c_int = 1;
-            pub static IPPROTO_TCP: c_int = 6;
-            pub static IPPROTO_IP: c_int = 0;
-            pub static IPPROTO_IPV6: c_int = 41;
-            pub static IP_MULTICAST_TTL: c_int = 33;
-            pub static IP_MULTICAST_LOOP: c_int = 34;
-            pub static IP_TTL: c_int = 2;
-            pub static IP_ADD_MEMBERSHIP: c_int = 35;
-            pub static IP_DROP_MEMBERSHIP: c_int = 36;
-            pub static IPV6_ADD_MEMBERSHIP: c_int = 20;
-            pub static IPV6_DROP_MEMBERSHIP: c_int = 21;
-
-            pub static TCP_NODELAY: c_int = 1;
-            pub static SOL_SOCKET: c_int = 65535;
-            pub static SO_KEEPALIVE: c_int = 8;
-            pub static SO_BROADCAST: c_int = 32;
-            pub static SO_REUSEADDR: c_int = 4;
-            pub static SO_ERROR: c_int = 4103;
-
-            pub static SHUT_RD: c_int = 0;
-            pub static SHUT_WR: c_int = 1;
-            pub static SHUT_RDWR: c_int = 2;
-        }
         #[cfg(target_arch = "x86")]
         #[cfg(target_arch = "x86_64")]
         #[cfg(target_arch = "arm")]

trunk/src/libnative/io/c_unix.rs

@@ -22,20 +22,15 @@ use libc;
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
 pub static FIONBIO: libc::c_ulong = 0x8004667e;
-#[cfg(target_os = "linux", not(target_arch = "mips"))]
+#[cfg(target_os = "linux")]
 #[cfg(target_os = "android")]
 pub static FIONBIO: libc::c_ulong = 0x5421;
-#[cfg(target_os = "linux", target_arch = "mips")]
-pub static FIONBIO: libc::c_ulong = 0x667e;
-
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
 pub static FIOCLEX: libc::c_ulong = 0x20006601;
-#[cfg(target_os = "linux", not(target_arch = "mips"))]
+#[cfg(target_os = "linux")]
 #[cfg(target_os = "android")]
 pub static FIOCLEX: libc::c_ulong = 0x5451;
-#[cfg(target_os = "linux", target_arch = "mips")]
-pub static FIOCLEX: libc::c_ulong = 0x6601;
 
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
@@ -105,7 +100,7 @@ mod select {
     }
 }
 
-#[cfg(target_os = "linux", not(target_arch = "mips"))]
+#[cfg(target_os = "linux")]
 #[cfg(target_os = "android")]
 mod signal {
     use libc;
@@ -148,44 +143,6 @@ mod signal {
     }
 }
 
-#[cfg(target_os = "linux", target_arch = "mips")]
-mod signal {
-    use libc;
-
-    pub static SA_NOCLDSTOP: libc::c_ulong = 0x00000001;
-    pub static SA_NOCLDWAIT: libc::c_ulong = 0x00010000;
-    pub static SA_NODEFER: libc::c_ulong = 0x40000000;
-    pub static SA_ONSTACK: libc::c_ulong = 0x08000000;
-    pub static SA_RESETHAND: libc::c_ulong = 0x80000000;
-    pub static SA_RESTART: libc::c_ulong = 0x10000000;
-    pub static SA_SIGINFO: libc::c_ulong = 0x00000008;
-    pub static SIGCHLD: libc::c_int = 18;
-
-    // This definition is not as accurate as it could be, {pid, uid, status} is
-    // actually a giant union. Currently we're only interested in these fields,
-    // however.
-    pub struct siginfo {
-        si_signo: libc::c_int,
-        si_code: libc::c_int,
-        si_errno: libc::c_int,
-        pub pid: libc::pid_t,
-        pub uid: libc::uid_t,
-        pub status: libc::c_int,
-    }
-
-    pub struct sigaction {
-        pub sa_flags: libc::c_uint,
-        pub sa_handler: extern fn(libc::c_int),
-        pub sa_mask: sigset_t,
-        sa_restorer: *mut libc::c_void,
-        sa_resv: [libc::c_int, ..1],
-    }
-
-    pub struct sigset_t {
-        __val: [libc::c_ulong, ..32],
-    }
-}
-
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
 mod signal {

trunk/src/libnative/io/net.rs

@@ -42,12 +42,11 @@ enum InAddr {
 fn ip_to_inaddr(ip: ip::IpAddr) -> InAddr {
     match ip {
         ip::Ipv4Addr(a, b, c, d) => {
-            let ip = (a as u32 << 24) |
-                     (b as u32 << 16) |
-                     (c as u32 <<  8) |
-                     (d as u32 <<  0);
             InAddr(libc::in_addr {
-                s_addr: mem::from_be32(ip)
+                s_addr: (d as u32 << 24) |
+                        (c as u32 << 16) |
+                        (b as u32 <<  8) |
+                        (a as u32 <<  0)
             })
         }
         ip::Ipv6Addr(a, b, c, d, e, f, g, h) => {
@@ -175,11 +174,11 @@ pub fn sockaddr_to_addr(storage: &libc::sockaddr_storage,
             let storage: &libc::sockaddr_in = unsafe {
                 mem::transmute(storage)
             };
-            let ip = mem::to_be32(storage.sin_addr.s_addr as u32);
-            let a = (ip >> 24) as u8;
-            let b = (ip >> 16) as u8;
-            let c = (ip >>  8) as u8;
-            let d = (ip >>  0) as u8;
+            let addr = storage.sin_addr.s_addr as u32;
+            let a = (addr >>  0) as u8;
+            let b = (addr >>  8) as u8;
+            let c = (addr >> 16) as u8;
+            let d = (addr >> 24) as u8;
             Ok(ip::SocketAddr {
                 ip: ip::Ipv4Addr(a, b, c, d),
                 port: ntohs(storage.sin_port),

trunk/src/librustdoc/html/render.rs

@@ -1094,10 +1094,10 @@ impl<'a> Item<'a> {
             let path = cache.external_paths.get(&self.item.def_id);
             let root = match *cache.extern_locations.get(&self.item.def_id.krate) {
                 Remote(ref s) => s.to_string(),
-                Local => self.cx.root_path.clone(),
+                Local => format!("{}/..", self.cx.root_path),
                 Unknown => return None,
             };
-            Some(format!("{root}{path}/{file}?gotosrc={goto}",
+            Some(format!("{root}/{path}/{file}?gotosrc={goto}",
                          root = root,
                          path = path.slice_to(path.len() - 1).connect("/"),
                          file = item_path(self.item),

trunk/src/librustuv/net.rs

@@ -43,11 +43,11 @@ pub fn sockaddr_to_addr(storage: &libc::sockaddr_storage,
             let storage: &libc::sockaddr_in = unsafe {
                 mem::transmute(storage)
             };
-            let ip = mem::to_be32(storage.sin_addr.s_addr as u32);
-            let a = (ip >> 24) as u8;
-            let b = (ip >> 16) as u8;
-            let c = (ip >>  8) as u8;
-            let d = (ip >>  0) as u8;
+            let addr = storage.sin_addr.s_addr as u32;
+            let a = (addr >>  0) as u8;
+            let b = (addr >>  8) as u8;
+            let c = (addr >> 16) as u8;
+            let d = (addr >> 24) as u8;
             ip::SocketAddr {
                 ip: ip::Ipv4Addr(a, b, c, d),
                 port: ntohs(storage.sin_port),
@@ -82,16 +82,15 @@ fn addr_to_sockaddr(addr: ip::SocketAddr) -> (libc::sockaddr_storage, uint) {
         let mut storage: libc::sockaddr_storage = mem::zeroed();
         let len = match addr.ip {
             ip::Ipv4Addr(a, b, c, d) => {
-                let ip = (a as u32 << 24) |
-                         (b as u32 << 16) |
-                         (c as u32 <<  8) |
-                         (d as u32 <<  0);
                 let storage: &mut libc::sockaddr_in =
                     mem::transmute(&mut storage);
                 (*storage).sin_family = libc::AF_INET as libc::sa_family_t;
                 (*storage).sin_port = htons(addr.port);
                 (*storage).sin_addr = libc::in_addr {
-                    s_addr: mem::from_be32(ip)
+                    s_addr: (d as u32 << 24) |
+                            (c as u32 << 16) |
+                            (b as u32 <<  8) |
+                            (a as u32 <<  0)
                 };
                 mem::size_of::<libc::sockaddr_in>()
             }

trunk/src/libstd/macros.rs

@@ -331,11 +331,11 @@ macro_rules! vec(
 )
 
 
-/// A macro to select an event from a number of receivers.
+/// A macro to select an event from a number of ports.
 ///
 /// This macro is used to wait for the first event to occur on a number of
-/// receivers. It places no restrictions on the types of receivers given to
-/// this macro, this can be viewed as a heterogeneous select.
+/// ports. It places no restrictions on the types of ports given to this macro,
+/// this can be viewed as a heterogeneous select.
 ///
 /// # Example
 ///

trunk/src/libstd/str.rs

@@ -86,8 +86,8 @@ use vec::Vec;
 pub use core::str::{from_utf8, CharEq, Chars, CharOffsets};
 pub use core::str::{Bytes, CharSplits};
 pub use core::str::{CharSplitsN, Words, AnyLines, MatchIndices, StrSplits};
-pub use core::str::{eq_slice, is_utf8, is_utf16, UTF16Items};
-pub use core::str::{UTF16Item, ScalarValue, LoneSurrogate, utf16_items};
+pub use core::str::{eq_slice, is_utf8, is_utf16, Utf16Items};
+pub use core::str::{Utf16Item, ScalarValue, LoneSurrogate, utf16_items};
 pub use core::str::{truncate_utf16_at_nul, utf8_char_width, CharRange};
 pub use core::str::{Str, StrSlice};