Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 680c201

Browse files
committed
Remove tuple-struct derefing (rust-lang/rust#11188)
1 parent 642a9ce commit 680c201

File tree

1 file changed

+36
-8
lines changed

1 file changed

+36
-8
lines changed

src/http/memstream.rs

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,27 @@ impl MemWriterFakeStream {
1111
}
1212

1313
impl Writer for MemWriterFakeStream {
14-
fn write(&mut self, buf: &[u8]) { (**self).write(buf) }
15-
fn flush(&mut self) { (**self).flush() }
14+
fn write(&mut self, buf: &[u8]) {
15+
let &MemWriterFakeStream(ref mut s) = self;
16+
s.write(buf)
17+
}
18+
19+
fn flush(&mut self) {
20+
let &MemWriterFakeStream(ref mut s) = self;
21+
s.flush()
22+
}
1623
}
1724

1825
impl Seek for MemWriterFakeStream {
19-
fn tell(&self) -> u64 { (**self).tell() }
20-
fn seek(&mut self, pos: i64, style: SeekStyle) { (**self).seek(pos, style) }
26+
fn tell(&self) -> u64 {
27+
let &MemWriterFakeStream(ref s) = self;
28+
s.tell()
29+
}
30+
31+
fn seek(&mut self, pos: i64, style: SeekStyle) {
32+
let &MemWriterFakeStream(ref mut s) = self;
33+
s.seek(pos, style)
34+
}
2135
}
2236

2337
impl Reader for MemWriterFakeStream {
@@ -37,13 +51,27 @@ impl MemReaderFakeStream {
3751
}
3852

3953
impl Reader for MemReaderFakeStream {
40-
fn read(&mut self, buf: &mut [u8]) -> Option<uint> { (**self).read(buf) }
41-
fn eof(&mut self) -> bool { (**self).eof() }
54+
fn read(&mut self, buf: &mut [u8]) -> Option<uint> {
55+
let &MemReaderFakeStream(ref mut s) = self;
56+
s.read(buf)
57+
}
58+
59+
fn eof(&mut self) -> bool {
60+
let &MemReaderFakeStream(ref mut s) = self;
61+
s.eof()
62+
}
4263
}
4364

4465
impl Seek for MemReaderFakeStream {
45-
fn tell(&self) -> u64 { (**self).tell() }
46-
fn seek(&mut self, pos: i64, style: SeekStyle) { (**self).seek(pos, style) }
66+
fn tell(&self) -> u64 {
67+
let &MemReaderFakeStream(ref s) = self;
68+
s.tell()
69+
}
70+
71+
fn seek(&mut self, pos: i64, style: SeekStyle) {
72+
let &MemReaderFakeStream(ref mut s) = self;
73+
s.seek(pos, style)
74+
}
4775
}
4876

4977
impl Writer for MemReaderFakeStream {

0 commit comments

Comments
 (0)