about summary refs log tree commit diff
path: root/src/compiletest/errors.rs
diff options
context:
space:
mode:
authorklutzy <klutzytheklutzy@gmail.com>2013-12-08 16:12:07 +0900
committerklutzy <klutzytheklutzy@gmail.com>2013-12-11 15:50:51 +0900
commit5a93d12e01c8275674bcdb6f3f765a7bdcf08779 (patch)
tree32866c4cc1b0bdcd81e23dad666a51e34c94d8d4 /src/compiletest/errors.rs
parentb8b16ae0996074861693f0f76d5d937fafe6a37e (diff)
downloadrust-5a93d12e01c8275674bcdb6f3f765a7bdcf08779.tar.gz
rust-5a93d12e01c8275674bcdb6f3f765a7bdcf08779.zip
std::io: Add Buffer.lines(), change .bytes() api
-   `Buffer.lines()` returns `LineIterator` which yields line using
    `.read_line()`.
-   `Reader.bytes()` now takes `&mut self` instead of `self`.
-   `Reader.read_until()` swallows `EndOfFile`. This also affects
    `.read_line()`.
Diffstat (limited to 'src/compiletest/errors.rs')
-rw-r--r--src/compiletest/errors.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs
index 6be92b12535..b15bf73c193 100644
--- a/src/compiletest/errors.rs
+++ b/src/compiletest/errors.rs
@@ -19,10 +19,7 @@ pub fn load_errors(testfile: &Path) -> ~[ExpectedError] {
     let mut error_patterns = ~[];
     let mut rdr = BufferedReader::new(File::open(testfile).unwrap());
     let mut line_num = 1u;
-    loop {
-        let ln = match rdr.read_line() {
-            Some(ln) => ln, None => break,
-        };
+    for ln in rdr.lines() {
         error_patterns.push_all_move(parse_expected(line_num, ln));
         line_num += 1u;
     }