---

yaml
---
r: 83559
b: refs/heads/try
c: b617569
h: refs/heads/master
i:
  83557: e66e44e
  83555: 7e8d6e3
  83551: e2410c9
v: v3

Author: toffaletti

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: f4f6b951d7e6f3940dba4faa35b65a7619466d95
+refs/heads/try: b617569583e6b15d487c44ec6f7af866f2064d77
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/os.rs

@@ -1398,7 +1398,7 @@ impl to_str::ToStr for MapError {
 
 #[cfg(unix)]
 impl MemoryMap {
-    pub fn new(min_len: uint, options: ~[MapOption]) -> Result<~MemoryMap, MapError> {
+    pub fn new(min_len: uint, options: &[MapOption]) -> Result<MemoryMap, MapError> {
         #[fixed_stack_segment]; #[inline(never)];
 
         use libc::off_t;
@@ -1441,7 +1441,7 @@ impl MemoryMap {
                 code => ErrUnknown(code)
             })
         } else {
-            Ok(~MemoryMap {
+            Ok(MemoryMap {
                data: r as *mut u8,
                len: len,
                kind: if fd == -1 {
@@ -1478,7 +1478,7 @@ impl Drop for MemoryMap {
 
 #[cfg(windows)]
 impl MemoryMap {
-    pub fn new(min_len: uint, options: ~[MapOption]) -> Result<~MemoryMap, MapError> {
+    pub fn new(min_len: uint, options: &[MapOption]) -> Result<MemoryMap, MapError> {
         #[fixed_stack_segment]; #[inline(never)];
 
         use libc::types::os::arch::extra::{LPVOID, DWORD, SIZE_T, HANDLE};
@@ -1524,7 +1524,7 @@ impl MemoryMap {
             };
             match r as uint {
                 0 => Err(ErrVirtualAlloc(errno())),
-                _ => Ok(~MemoryMap {
+                _ => Ok(MemoryMap {
                    data: r as *mut u8,
                    len: len,
                    kind: MapVirtual
@@ -1560,7 +1560,7 @@ impl MemoryMap {
                                             0);
                 match r as uint {
                     0 => Err(ErrMapViewOfFile(errno())),
-                    _ => Ok(~MemoryMap {
+                    _ => Ok(MemoryMap {
                        data: r as *mut u8,
                        len: len,
                        kind: MapFile(mapping as *c_void)
@@ -1996,7 +1996,7 @@ mod tests {
     fn memory_map_rw() {
         use result::{Ok, Err};
 
-        let chunk = match os::MemoryMap::new(16, ~[
+        let chunk = match os::MemoryMap::new(16, [
             os::MapReadable,
             os::MapWritable
         ]) {
@@ -2050,7 +2050,7 @@ mod tests {
             }
             fd
         };
-        let chunk = match MemoryMap::new(size / 2, ~[
+        let chunk = match MemoryMap::new(size / 2, [
             MapReadable,
             MapWritable,
             MapFd(fd),

branches/try/src/libstd/rt/uv/net.rs

@@ -624,6 +624,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME #8815
     fn listen_ip4() {
         do run_in_bare_thread() {
             static MAX: int = 10;
@@ -698,6 +699,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME #8815
     fn listen_ip6() {
         do run_in_bare_thread() {
             static MAX: int = 10;
@@ -774,6 +776,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME #8815
     fn udp_recv_ip4() {
         do run_in_bare_thread() {
             static MAX: int = 10;
@@ -834,6 +837,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME #8815
     fn udp_recv_ip6() {
         do run_in_bare_thread() {
             static MAX: int = 10;