---

yaml
---
r: 190682
b: refs/heads/master
c: a0297cb
h: refs/heads/master
v: v3

Author: richo

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 857ac28867722111249b5c3ef68e32499bd11ea0
+refs/heads/master: a0297cbe1264a9bb61c883b47519288ada713e77
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c64d671671aea2e44ee7fc6eb00ee75fc30ed7b9
 refs/heads/try: 1c28ab65017d74fc13d003f7c7a73d1a48e5406f

trunk/configure

@@ -461,7 +461,10 @@ case $CFG_CPUTYPE in
         CFG_CPUTYPE=aarch64
         ;;
 
-    powerpc)
+    # At some point, when ppc64[le] support happens, this will need to do
+    # something clever. For now it's safe to assume that we're only ever
+    # interested in building 32 bit.
+    powerpc | ppc | ppc64)
         CFG_CPUTYPE=powerpc
         ;;
 

trunk/src/libstd/net/mod.rs

@@ -11,7 +11,8 @@
 //! Networking primitives for TCP/UDP communication
 //!
 //! > **NOTE**: This module is very much a work in progress and is under active
-//! > development.
+//! > development. At this time it is still recommended to use the `old_io`
+//! > module while the details of this module shake out.
 
 #![unstable(feature = "net")]
 

trunk/src/libstd/sys/unix/os.rs

@@ -206,7 +206,7 @@ pub fn current_exe() -> io::Result<PathBuf> {
         if err != 0 { return Err(io::Error::last_os_error()); }
         if sz == 0 { return Err(io::Error::last_os_error()); }
         v.set_len(sz as uint - 1); // chop off trailing NUL
-        Ok(PathBuf::new::<OsString>(OsStringExt::from_vec(v)))
+        Ok(PathBuf::new::<OsString>(&OsStringExt::from_vec(v)))
     }
 }
 
@@ -232,7 +232,7 @@ pub fn current_exe() -> io::Result<PathBuf> {
             Err(io::Error::last_os_error())
         } else {
             let vec = CStr::from_ptr(v).to_bytes().to_vec();
-            Ok(PathBuf::new::<OsString>(OsStringExt::from_vec(vec)))
+            Ok(PathBuf::new::<OsString>(&OsStringExt::from_vec(vec)))
         }
     }
 }