user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Close out #9155

Browse source 
Add a test to make sure it works and switch a private struct over to a
newtype.

Closes #9155
This commit is contained in:
Steven Fackler 2013-10-03 00:15:54 -07:00
parent b637798a5a
commit 435ca16f4f
3 changed files with 46 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libstd/rt/io/buffered.rs
View file

@ -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()
}
}