---

yaml
---
r: 143342
b: refs/heads/try2
c: b92d1ea
h: refs/heads/master
v: v3

Author: stepancheg

[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: 5842ab36b81f0a3e8d6dd48a200bc405ad19ca96
+refs/heads/try2: b92d1ea723034c3f9adc10a6da11b124a20c57b1
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/io.rs

@@ -148,6 +148,9 @@ pub trait Reader {
     /**
     * Returns a boolean value: are we currently at EOF?
     *
+    * Note that stream position may be already at the end-of-file point,
+    * but `eof` returns false until an attempt to read at that position.
+    *
     * `eof` is conceptually similar to C's `feof` function.
     *
     * # Examples
@@ -724,15 +727,21 @@ impl<T:Reader> ReaderUtil for T {
     }
 
     fn each_byte(&self, it: &fn(int) -> bool) -> bool {
-        while !self.eof() {
-            if !it(self.read_byte()) { return false; }
+        loop {
+            match self.read_byte() {
+                -1 => break,
+                ch => if !it(ch) { return false; }
+            }
         }
         return true;
     }
 
     fn each_char(&self, it: &fn(char) -> bool) -> bool {
-        while !self.eof() {
-            if !it(self.read_char()) { return false; }
+        loop {
+            match self.read_char() {
+                eof if eof == (-1 as char) => break,
+                ch => if !it(ch) { return false; }
+            }
         }
         return true;
     }
@@ -1858,6 +1867,31 @@ mod tests {
         assert_eq!(frood, frood2);
     }
 
+    #[test]
+    fn test_each_byte_each_char_file() {
+        // Issue #5056 -- shouldn't include trailing EOF.
+        let path = Path("tmp/lib-io-test-each-byte-each-char-file.tmp");
+
+        {
+            // create empty, enough to reproduce a problem
+            io::file_writer(&path, [io::Create]).unwrap();
+        }
+
+        {
+            let file = io::file_reader(&path).unwrap();
+            for file.each_byte() |_| {
+                fail!("must be empty");
+            }
+        }
+
+        {
+            let file = io::file_reader(&path).unwrap();
+            for file.each_char() |_| {
+                fail!("must be empty");
+            }
+        }
+    }
+
     #[test]
     fn test_readchars_empty() {
         do io::with_str_reader("") |inp| {