---

yaml
---
r: 147430
b: refs/heads/try2
c: ee887d7
h: refs/heads/master
v: v3

Author: spaolacci

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: cab687853a63198e5de9aa094d4ac01d068d0285
+refs/heads/try2: ee887d70780bce4c89a8977d04f724064ee1ae8f
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/io/buffered.rs

@@ -322,6 +322,21 @@ mod test {
         fn write(&mut self, _: &[u8]) { }
     }
 
+    /// A dummy reader intended at testing short-reads propagation.
+    pub struct ShortReader {
+        priv lengths: ~[uint],
+    }
+
+    impl Reader for ShortReader {
+        fn read(&mut self, _: &mut [u8]) -> Option<uint> {
+            self.lengths.shift_opt()
+        }
+
+        fn eof(&mut self) -> bool {
+            self.lengths.len() == 0
+        }
+    }
+
     #[test]
     fn test_buffered_reader() {
         let inner = MemReader::new(~[0, 1, 2, 3, 4]);
@@ -475,6 +490,19 @@ mod test {
         assert_eq!(it.next(), None);
     }
 
+    #[test]
+    fn test_short_reads() {
+        let inner = ShortReader{lengths: ~[0, 1, 2, 0, 1, 0]};
+        let mut reader = BufferedReader::new(inner);
+        let mut buf = [0, 0];
+        assert_eq!(reader.read(buf), Some(0));
+        assert_eq!(reader.read(buf), Some(1));
+        assert_eq!(reader.read(buf), Some(2));
+        assert_eq!(reader.read(buf), Some(0));
+        assert_eq!(reader.read(buf), Some(1));
+        assert_eq!(reader.read(buf), None);
+    }
+
 
     #[bench]
     fn bench_buffered_reader(bh: &mut Harness) {