diff -r acca351fb8f0 -r e619e18dcec3 structs.go
--- a/structs.go Thu Jan 19 11:06:42 2012 -0600
+++ b/structs.go Thu Jan 19 12:25:36 2012 -0600
@@ -8,13 +8,13 @@
import (
"bytes"
+ "encoding/xml"
+ "errors"
"flag"
"fmt"
"io"
- "os"
"regexp"
"strings"
- "xml"
)
// JID represents an entity that can communicate with other
@@ -164,7 +164,7 @@
Any *Generic
}
-var _ os.Error = &Error{}
+var _ error = &Error{}
// Used for resource binding as a nested element inside .
type bindIq struct {
@@ -207,7 +207,7 @@
return true
}
-func (s *stream) MarshalXML() ([]byte, os.Error) {
+func (s *stream) MarshalXML() ([]byte, error) {
buf := bytes.NewBuffer(nil)
buf.WriteString("")
xml.Marshal(buf, s.Any)
@@ -257,7 +257,7 @@
return buf.Bytes(), nil
}
-func (e *errText) MarshalXML() ([]byte, os.Error) {
+func (e *errText) MarshalXML() ([]byte, error) {
buf := bytes.NewBuffer(nil)
buf.WriteString("