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

Commit 5e664c7

Browse files
committed
Remove impl Seek for MemWriterFakeStream.
Its seekability wasn’t being used, and so in light of the changes made in rust-lang/rust#15915 it should be removed, rather than switching from the now-unseekable ``MemWriter`` to the new ``SeekableMemWriter``. This necessitated adding the ``get_ref`` method which was added to ``MemWriter`` at some point.
1 parent 59052ae commit 5e664c7

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

src/http/memstream.rs

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ struct MemWriterFakeStream(MemWriter);
88

99
impl MemWriterFakeStream {
1010
pub fn new() -> MemWriterFakeStream { MemWriterFakeStream(MemWriter::new()) }
11+
12+
pub fn get_ref(&self) -> &[u8] {
13+
let &MemWriterFakeStream(ref s) = self;
14+
s.get_ref()
15+
}
1116
}
1217

1318
impl Writer for MemWriterFakeStream {
@@ -22,18 +27,6 @@ impl Writer for MemWriterFakeStream {
2227
}
2328
}
2429

25-
impl Seek for MemWriterFakeStream {
26-
fn tell(&self) -> IoResult<u64> {
27-
let &MemWriterFakeStream(ref s) = self;
28-
s.tell()
29-
}
30-
31-
fn seek(&mut self, pos: i64, style: SeekStyle) -> IoResult<()> {
32-
let &MemWriterFakeStream(ref mut s) = self;
33-
s.seek(pos, style)
34-
}
35-
}
36-
3730
impl Reader for MemWriterFakeStream {
3831
fn read(&mut self, _buf: &mut [u8]) -> IoResult<uint> {
3932
fail!("Uh oh, you didn't aught to call MemWriterFakeStream.read()!")
@@ -82,12 +75,12 @@ mod test {
8275
#[test]
8376
fn test_mem_writer_fake_stream() {
8477
let mut writer = MemWriterFakeStream::new();
85-
assert_eq!(writer.tell(), Ok(0));
78+
assert_eq!(writer.get_ref(), &[]);
8679
assert_eq!(writer.write([0]), Ok(()));
87-
assert_eq!(writer.tell(), Ok(1));
80+
assert_eq!(writer.get_ref(), &[0]);
8881
assert_eq!(writer.write([1, 2, 3]), Ok(()));
8982
assert_eq!(writer.write([4, 5, 6, 7]), Ok(()));
90-
assert_eq!(writer.tell(), Ok(8));
83+
assert_eq!(writer.get_ref(), &[0, 1, 2, 3, 4, 5, 6, 7]);
9184
}
9285

9386
#[test]

0 commit comments

Comments
 (0)