---

alexcrichton · alexcrichton · commit b9548f0f2ed4 · 2014-03-22T08:57:58.000-07:00
yaml --- r: 150230 b: refs/heads/try2 c: 02dab5a h: refs/heads/master v: v3
diff --git a/[refs] b/[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: 55603830715a1e4c99683660b141b6a4c3491d0c
+refs/heads/try2: 02dab5a3e79a48c77d28c9aa6dcfea173584933b
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librand/reader.rs b/branches/try2/src/librand/reader.rs
@@ -60,10 +60,8 @@ impl<R: Reader> Rng for ReaderRng<R> {
     }
     fn fill_bytes(&mut self, v: &mut [u8]) {
         if v.len() == 0 { return }
-        match self.reader.read(v) {
-            Ok(n) if n == v.len() => return,
-            Ok(n) => fail!("ReaderRng.fill_bytes could not fill buffer: \
-                            read {} out of {} bytes.", n, v.len()),
+        match self.reader.fill(v) {
+            Ok(()) => {}
             Err(e) => fail!("ReaderRng.fill_bytes error: {}", e)
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,8 @@ impl<R: Reader> Rng for ReaderRng<R> {`
`60`	`60`	`}`
`61`	`61`	`fn fill_bytes(&mut self, v: &mut [u8]) {`
`62`	`62`	`if v.len() == 0 { return }`
`63`		`- match self.reader.read(v) {`
`64`		`- Ok(n) if n == v.len() => return,`
`65`		`- Ok(n) => fail!("ReaderRng.fill_bytes could not fill buffer: \`
`66`		`- read {} out of {} bytes.", n, v.len()),`
	`63`	`+ match self.reader.fill(v) {`
	`64`	`+ Ok(()) => {}`
`67`	`65`	`Err(e) => fail!("ReaderRng.fill_bytes error: {}", e)`
`68`	`66`	`}`
`69`	`67`	`}`