---

yaml
---
r: 81364
b: refs/heads/snap-stage3
c: 435ca16
h: refs/heads/master
v: v3

Author: sfackler

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 0640ae0ecde3cfbd6611652e19da0d6fde193548
+refs/heads/snap-stage3: 435ca16f4fa7bd47c16de693054be5cba5fd4ebb
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/rt/io/buffered.rs

@@ -187,25 +187,21 @@ impl<W: Writer> Decorator<W> for BufferedWriter<W> {
     }
 }
 
-// FIXME #9155 this should be a newtype struct
-struct InternalBufferedWriter<W> {
-    inner: BufferedWriter<W>
-}
+struct InternalBufferedWriter<W>(BufferedWriter<W>);
 
 impl<W: Reader> Reader for InternalBufferedWriter<W> {
     fn read(&mut self, buf: &mut [u8]) -> Option<uint> {
-        self.inner.inner.read(buf)
+        self.inner.read(buf)
     }
 
     fn eof(&mut self) -> bool {
-        self.inner.inner.eof()
+        self.inner.eof()
     }
 }
 
 /// Wraps a Stream and buffers input and output to and from it
 ///
 /// Note that `BufferedStream` will NOT flush its output buffer when dropped.
-// FIXME #9155 this should be a newtype struct
 pub struct BufferedStream<S> {
     priv inner: BufferedReader<InternalBufferedWriter<S>>
 }
@@ -214,7 +210,7 @@ impl<S: Stream> BufferedStream<S> {
     pub fn with_capacities(reader_cap: uint, writer_cap: uint, inner: S)
                            -> BufferedStream<S> {
         let writer = BufferedWriter::with_capacity(writer_cap, inner);
-        let internal_writer = InternalBufferedWriter { inner: writer };
+        let internal_writer = InternalBufferedWriter(writer);
         let reader = BufferedReader::with_capacity(reader_cap,
                                                    internal_writer);
         BufferedStream { inner: reader }
@@ -238,25 +234,25 @@ impl<S: Stream> Reader for BufferedStream<S> {
 
 impl<S: Stream> Writer for BufferedStream<S> {
     fn write(&mut self, buf: &[u8]) {
-        self.inner.inner.inner.write(buf)
+        self.inner.inner.write(buf)
     }
 
     fn flush(&mut self) {
-        self.inner.inner.inner.flush()
+        self.inner.inner.flush()
     }
 }
 
 impl<S: Stream> Decorator<S> for BufferedStream<S> {
     fn inner(self) -> S {
-        self.inner.inner.inner.inner()
+        self.inner.inner.inner()
     }
 
     fn inner_ref<'a>(&'a self) -> &'a S {
-        self.inner.inner.inner.inner_ref()
+        self.inner.inner.inner_ref()
     }
 
     fn inner_mut_ref<'a>(&'a mut self) -> &'a mut S {
-        self.inner.inner.inner.inner_mut_ref()
+        self.inner.inner.inner_mut_ref()
     }
 }
 

branches/snap-stage3/src/test/auxiliary/issue_9155.rs

@@ -0,0 +1,17 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub struct Foo<T>(T);
+
+impl<T> Foo<T> {
+    pub fn new(t: T) -> Foo<T> {
+        Foo(t)
+    }
+}

branches/snap-stage3/src/test/run-pass/issue_9155.rs

@@ -0,0 +1,20 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// aux-build:issue_9155.rs
+// xfail-fast windows doesn't like the aux-build
+
+extern mod issue_9155;
+
+struct Baz;
+
+fn main() {
+    issue_9155::Foo::new(Baz);
+}

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

@@ -29,7 +29,7 @@ use std::rt::io::pipe::*;
 use std::str;
 
 #[test]
-#[cfg(unix, not(target_os="android"))]
+#[cfg(unix, not(android))]
 fn smoke() {
     let io = ~[];
     let args = ProcessConfig {
@@ -46,7 +46,7 @@ fn smoke() {
 }
 
 #[test]
-#[cfg(unix, not(target_os="android"))]
+#[cfg(unix, not(android))]
 fn smoke_failure() {
     let io = ~[];
     let args = ProcessConfig {
@@ -63,7 +63,7 @@ fn smoke_failure() {
 }
 
 #[test]
-#[cfg(unix, not(target_os="android"))]
+#[cfg(unix, not(android))]
 fn exit_reported_right() {
     let io = ~[];
     let args = ProcessConfig {
@@ -103,7 +103,7 @@ fn run_output(args: ProcessConfig) -> ~str {
 }
 
 #[test]
-#[cfg(unix, not(target_os="android"))]
+#[cfg(unix, not(android))]
 fn stdout_works() {
     let pipe = PipeStream::new().unwrap();
     let io = ~[Ignored, CreatePipe(pipe, false, true)];
@@ -118,7 +118,7 @@ fn stdout_works() {
 }
 
 #[test]
-#[cfg(unix, not(target_os="android"))]
+#[cfg(unix, not(android))]
 fn set_cwd_works() {
     let pipe = PipeStream::new().unwrap();
     let io = ~[Ignored, CreatePipe(pipe, false, true)];
@@ -134,7 +134,7 @@ fn set_cwd_works() {
 }
 
 #[test]
-#[cfg(unix, not(target_os="android"))]
+#[cfg(unix, not(android))]
 fn stdin_works() {
     let input = PipeStream::new().unwrap();
     let output = PipeStream::new().unwrap();