libgo: Update to weekly.2011-12-14.

[pf3gnuchains/gcc-fork.git] / libgo / go / html / template / escape_test.go

diff --git a/libgo/go/html/template/escape_test.go b/libgo/go/html/template/escape_test.go
index cdeed48..2d15c71 100644 (file)
--- a/libgo/go/html/template/escape_test.go
+++ b/libgo/go/html/template/escape_test.go
@@ -654,7 +654,7 @@ func TestEscape(t *testing.T) {
        for _, test := range tests {
                tmpl := New(test.name)
                // TODO: Move noescape into template/func.go
-               tmpl.Funcs(template.FuncMap{
+               tmpl.Funcs(FuncMap{
                        "noescape": func(a ...interface{}) string {
                                return fmt.Sprint(a...)
                        },
@@ -792,7 +792,7 @@ func TestEscapeSet(t *testing.T) {
 
        // pred is a template function that returns the predecessor of a
        // natural number for testing recursive templates.
-       fns := template.FuncMap{"pred": func(a ...interface{}) (interface{}, error) {
+       fns := FuncMap{"pred": func(a ...interface{}) (interface{}, error) {
                if len(a) == 1 {
                        if i, _ := a[0].(int); i > 0 {
                                return i - 1, nil