From 9c63abc9a1d127f95162756467284cf76b47aff8 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 7 Dec 2011 01:11:29 +0000
Subject: libgo: Update to weekly 2011-11-09.

From-SVN: r182073
---
 libgo/go/strings/reader.go       | 4 ++--
 libgo/go/strings/strings.go      | 2 +-
 libgo/go/strings/strings_test.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libgo/go/strings')

diff --git a/libgo/go/strings/reader.go b/libgo/go/strings/reader.go
index ac8d9dc..8ff851f 100644
--- a/libgo/go/strings/reader.go
+++ b/libgo/go/strings/reader.go
@@ -7,7 +7,7 @@ package strings
 import (
 	"errors"
 	"io"
-	"utf8"
+	"unicode/utf8"
 )
 
 // A Reader implements the io.Reader, io.ByteScanner, and
@@ -58,7 +58,7 @@ func (r *Reader) UnreadByte() error {
 
 // ReadRune reads and returns the next UTF-8-encoded
 // Unicode code point from the buffer.
-// If no bytes are available, the error returned is os.EOF.
+// If no bytes are available, the error returned is io.EOF.
 // If the bytes are an erroneous UTF-8 encoding, it
 // consumes one byte and returns U+FFFD, 1.
 func (r *Reader) ReadRune() (ch rune, size int, err error) {
diff --git a/libgo/go/strings/strings.go b/libgo/go/strings/strings.go
index 4f6e8a6..b4d9207 100644
--- a/libgo/go/strings/strings.go
+++ b/libgo/go/strings/strings.go
@@ -7,7 +7,7 @@ package strings
 
 import (
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // explode splits s into an array of UTF-8 sequences, one per Unicode character (still strings) up to a maximum of n (n < 0 means no limit).
diff --git a/libgo/go/strings/strings_test.go b/libgo/go/strings/strings_test.go
index 2cf4bde..304d69a 100644
--- a/libgo/go/strings/strings_test.go
+++ b/libgo/go/strings/strings_test.go
@@ -12,8 +12,8 @@ import (
 	. "strings"
 	"testing"
 	"unicode"
+	"unicode/utf8"
 	"unsafe"
-	"utf8"
 )
 
 func eq(a, b []string) bool {
-- 
cgit v1.1