---

yaml
---
r: 58183
b: refs/heads/auto
c: db1a274
h: refs/heads/master
i:
  58181: 1926d8a
  58179: bcacfad
  58175: 6ea15ad
v: v3

Author: indutny

[refs]

@@ -14,6 +14,6 @@ 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: 45ae3402e034e83d254d1bc36914f8433202bad9
+refs/heads/auto: db1a274bf54343605c8ac3a38a6c69f7d930192b
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/io.rs

@@ -868,9 +868,19 @@ impl Reader for *libc::FILE {
                 assert!(buf_len >= len);
 
                 let count = libc::fread(buf_p as *mut c_void, 1u as size_t,
-                                        len as size_t, *self);
+                                        len as size_t, *self) as uint;
+                if count < len {
+                  match libc::ferror(*self) {
+                    0 => (),
+                    _ => {
+                      error!("error reading buffer");
+                      error!("%s", os::last_os_error());
+                      fail!();
+                    }
+                  }
+                }
 
-                count as uint
+                count
             }
         }
     }

branches/auto/src/libcore/vec.rs

@@ -3305,7 +3305,7 @@ mod tests {
     }
 
     #[test]
-    fn test_each_nonempty() {
+    fn test_iter_nonempty() {
         let mut i = 0;
         for each(~[1, 2, 3]) |v| {
             i += *v;
@@ -3314,7 +3314,7 @@ mod tests {
     }
 
     #[test]
-    fn test_eachi() {
+    fn test_iteri() {
         let mut i = 0;
         for eachi(~[1, 2, 3]) |j, v| {
             if i == 0 { assert!(*v == 1); }