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/xml/marshal_test.go | |
| parent | 02e9018f1616b23f1276151797216717b3564202 (diff) | |
| download | gcc-2fd401c8f190f1fe43e51a7f726f6ed6119a1f96.tar.gz | |
libgo: Update to weekly.2011-11-02.
From-SVN: r181964
Diffstat (limited to 'libgo/go/xml/marshal_test.go')
| -rw-r--r-- | libgo/go/xml/marshal_test.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libgo/go/xml/marshal_test.go b/libgo/go/xml/marshal_test.go index eb358d5dcce..59007b36456 100644 --- a/libgo/go/xml/marshal_test.go +++ b/libgo/go/xml/marshal_test.go @@ -7,11 +7,9 @@ package xml import ( "reflect" "testing" - "bytes" - "os" - "strconv" "strings" + "strconv" ) type DriveType int @@ -39,7 +37,7 @@ type Ship struct { type RawXML string -func (rx RawXML) MarshalXML() ([]byte, os.Error) { +func (rx RawXML) MarshalXML() ([]byte, error) { return []byte(rx), nil } @@ -342,7 +340,7 @@ func TestMarshalErrors(t *testing.T) { for idx, test := range marshalErrorTests { buf := bytes.NewBuffer(nil) err := Marshal(buf, test.Value) - if err == nil || err.String() != test.Err { + if err == nil || err.Error() != test.Err { t.Errorf("#%d: marshal(%#v) = [error] %q, want %q", idx, test.Value, err, test.Err) } if kind := err.(*UnsupportedTypeError).Type.Kind(); kind != test.Kind { |