libgo: Update to weekly 2011-11-09.

[pf3gnuchains/gcc-fork.git] / libgo / go / text / template / funcs.go

diff --git a/libgo/go/template/funcs.go b/libgo/go/text/template/funcs.go
similarity index 99%
rename from libgo/go/template/funcs.go
rename to libgo/go/text/template/funcs.go
index 26c3a6e..2ca09a7 100644 (file)
--- a/libgo/go/template/funcs.go
+++ b/libgo/go/text/template/funcs.go
@@ -8,11 +8,11 @@ import (
        "bytes"
        "fmt"
        "io"
+       "net/url"
        "reflect"
        "strings"
        "unicode"
-       "url"
-       "utf8"
+       "unicode/utf8"
 )
 
 // FuncMap is the type of the map defining the mapping from names to functions.
@@ -72,7 +72,7 @@ func goodFunc(typ reflect.Type) bool {
        switch {
        case typ.NumOut() == 1:
                return true
-       case typ.NumOut() == 2 && typ.Out(1) == osErrorType:
+       case typ.NumOut() == 2 && typ.Out(1) == errorType:
                return true
        }
        return false