code review 5294074: src/pkg/[n-z]*: gofix -r error

src/pkg/path/filepath/match_test.go

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package filepath_test
 
 import (
-        "os"
         . "path/filepath"
         "testing"
         "runtime"
 )
 
 type MatchTest struct {
         pattern, s string
         match      bool
-        err        os.Error
+        err        error
 }
 
 var matchTests = []MatchTest{
         {"abc", "abc", true, nil},
         {"*", "abc", true, nil},
         {"*c", "abc", true, nil},
         {"a*", "a", true, nil},
         {"a*", "abc", true, nil},
         {"a*", "ab/c", false, nil},
         {"a*/b", "abc/b", true, nil},
@@ skipping 34 matching lines @@
         {"[x-]", "-", false, ErrBadPattern},
         {"[x-]", "z", false, ErrBadPattern},
         {"[-x]", "x", false, ErrBadPattern},
         {"[-x]", "-", false, ErrBadPattern},
         {"[-x]", "a", false, ErrBadPattern},
         {"\\", "a", false, ErrBadPattern},
         {"[a-b-c]", "a", false, ErrBadPattern},
         {"*x", "xxx", true, nil},
 }
 
-func errp(e os.Error) string {
+func errp(e error) string {
         if e == nil {
                 return "<nil>"
         }
-        return e.String()
+        return e.Error()
 }
 
 func TestMatch(t *testing.T) {
         if runtime.GOOS == "windows" {
                 // XXX: Don't pass for windows.
                 return
         }
         for _, tt := range matchTests {
                 ok, err := Match(tt.pattern, tt.s)
                 if ok != tt.match || err != tt.err {
@@ skipping 48 matching lines @@
                 }
         }
 }
 
 func TestGlobError(t *testing.T) {
         _, err := Glob("[7]")
         if err != nil {
                 t.Error("expected error for bad pattern; got none")
         }
 }