diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-12-03 02:17:34 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-12-03 02:17:34 +0000 |
| commit | 2fd401c8f190f1fe43e51a7f726f6ed6119a1f96 (patch) | |
| tree | 7f76eff391f37fe6467ff4ffbc0c582c9959ea30 /libgo/go/scanner | |
| parent | 02e9018f1616b23f1276151797216717b3564202 (diff) | |
| download | gcc-2fd401c8f190f1fe43e51a7f726f6ed6119a1f96.zip gcc-2fd401c8f190f1fe43e51a7f726f6ed6119a1f96.tar.gz gcc-2fd401c8f190f1fe43e51a7f726f6ed6119a1f96.tar.bz2 | |
libgo: Update to weekly.2011-11-02.
From-SVN: r181964
Diffstat (limited to 'libgo/go/scanner')
| -rw-r--r-- | libgo/go/scanner/scanner.go | 4 | ||||
| -rw-r--r-- | libgo/go/scanner/scanner_test.go | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libgo/go/scanner/scanner.go b/libgo/go/scanner/scanner.go index 3594db9..5ab3779 100644 --- a/libgo/go/scanner/scanner.go +++ b/libgo/go/scanner/scanner.go @@ -253,8 +253,8 @@ func (s *Scanner) next() rune { s.lastCharLen = 0 return EOF } - if err != os.EOF { - s.error(err.String()) + if err != io.EOF { + s.error(err.Error()) } // If err == EOF, we won't be getting more // bytes; break to avoid infinite loop. If diff --git a/libgo/go/scanner/scanner_test.go b/libgo/go/scanner/scanner_test.go index fb39883..b07e559 100644 --- a/libgo/go/scanner/scanner_test.go +++ b/libgo/go/scanner/scanner_test.go @@ -7,7 +7,7 @@ package scanner import ( "bytes" "fmt" - "os" + "io" "strings" "testing" "utf8" @@ -19,13 +19,13 @@ type StringReader struct { step int } -func (r *StringReader) Read(p []byte) (n int, err os.Error) { +func (r *StringReader) Read(p []byte) (n int, err error) { if r.step < len(r.data) { s := r.data[r.step] n = copy(p, s) r.step++ } else { - err = os.EOF + err = io.EOF } return } |