go fix. Clearly, I need to run this more often ;)

client.go

@@ -18,7 +18,7 @@ func main() {
 
 	// Create stream and configure it as a client connection.
 	jid := must(xmpp.ParseJID(*jid)).(xmpp.JID)
-	stream := must(xmpp.NewStream(jid.Domain + ":5222", &xmpp.StreamConfig{LogStanzas: true})).(*xmpp.Stream)
+	stream := must(xmpp.NewStream(jid.Domain+":5222", &xmpp.StreamConfig{LogStanzas: true})).(*xmpp.Stream)
 	client := must(xmpp.NewClientXMPP(stream, jid, *password, &xmpp.ClientConfig{InsecureSkipVerify: true})).(*xmpp.XMPP)
 
 	log.Printf("Connection established for %s\n", client.JID)

src/xmpp/client.go

@@ -146,8 +146,8 @@ type authHandler struct {
 }
 
 var authHandlers = []authHandler{
-		authHandler{"PLAIN", authenticatePlain},
-	}
+	{"PLAIN", authenticatePlain},
+}
 
 func authenticatePlain(stream *Stream, user, password string) error {
 	auth := saslAuth{Mechanism: "PLAIN", Text: saslEncodePlain(user, password)}
@@ -270,7 +270,7 @@ type tlsStartTLS struct {
 	Required *required `xml:"required"`
 }
 
-type required struct {}
+type required struct{}
 
 type saslFailure struct {
 	XMLName xml.Name `xml:"urn:ietf:params:xml:ns:xmpp-sasl failure"`

src/xmpp/uuid.go

@@ -15,4 +15,3 @@ func UUID4() string {
 	uuid[8] = (uuid[8] &^ 0x40) | 0x80
 	return fmt.Sprintf("%x-%x-%x-%x-%x", uuid[:4], uuid[4:6], uuid[6:8], uuid[8:10], uuid[10:])
 }
-

src/xmpp/xmpp.go

@@ -100,7 +100,7 @@ func (x *XMPP) AddFilter(m Matcher) (FilterId, chan interface{}) {
 	// Allocate chan and id.
 	ch := make(chan interface{})
 	id := x.nextFilterId
-	x.nextFilterId ++
+	x.nextFilterId++
 
 	// Insert at head of filters list.
 	filters := make([]filter, len(x.filters)+1)