---

alexcrichton · alexcrichton · commit eeb313ff7218 · 2014-03-22T08:57:58.000-07:00
yaml --- r: 106230 b: refs/heads/auto c: 02dab5a h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 55603830715a1e4c99683660b141b6a4c3491d0c
+refs/heads/auto: 02dab5a3e79a48c77d28c9aa6dcfea173584933b
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/librand/reader.rs b/branches/auto/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`	`}`