Run gofmt to keep people happy!

logging/glog/glog.go

@@ -2,8 +2,8 @@ package glog
 
 import (
 	"fmt"
-	"github.com/golang/glog"
 	"github.com/fluffle/goirc/logging"
+	"github.com/golang/glog"
 )
 
 // Simple adapter to utilise Google's GLog package with goirc.

logging/golog/golog.go

@@ -1,8 +1,8 @@
 package golog
 
 import (
-	log "github.com/fluffle/golog/logging"
 	"github.com/fluffle/goirc/logging"
+	log "github.com/fluffle/golog/logging"
 )
 
 // Simple adapter to utilise my logging package with goirc.

logging/logging.go

@@ -31,13 +31,14 @@ func SetLogger(l Logger) {
 
 // A nullLogger does nothing while fulfilling Logger.
 type nullLogger struct{}
+
 func (nl nullLogger) Debug(f string, a ...interface{}) {}
-func (nl nullLogger) Info(f string, a ...interface{}) {}
-func (nl nullLogger) Warn(f string, a ...interface{}) {}
+func (nl nullLogger) Info(f string, a ...interface{})  {}
+func (nl nullLogger) Warn(f string, a ...interface{})  {}
 func (nl nullLogger) Error(f string, a ...interface{}) {}
 
 // Shim functions so that the package can be used directly
 func Debug(f string, a ...interface{}) { logger.Debug(f, a...) }
-func Info(f string, a ...interface{}) { logger.Info(f, a...) }
-func Warn(f string, a ...interface{}) { logger.Warn(f, a...) }
+func Info(f string, a ...interface{})  { logger.Info(f, a...) }
+func Warn(f string, a ...interface{})  { logger.Warn(f, a...) }
 func Error(f string, a ...interface{}) { logger.Error(f, a...) }

state/channel.go

@@ -248,7 +248,9 @@ func (ch *Channel) Equals(other *Channel) bool {
 
 // Duplicates a ChanMode struct.
 func (cm *ChanMode) Copy() *ChanMode {
-	if cm == nil { return nil }
+	if cm == nil {
+		return nil
+	}
 	c := *cm
 	return &c
 }
@@ -260,7 +262,9 @@ func (cm *ChanMode) Equals(other *ChanMode) bool {
 
 // Duplicates a ChanPrivs struct.
 func (cp *ChanPrivs) Copy() *ChanPrivs {
-	if cp == nil { return nil }
+	if cp == nil {
+		return nil
+	}
 	c := *cp
 	return &c
 }

state/nick.go

@@ -144,7 +144,9 @@ func (nk *Nick) Equals(other *Nick) bool {
 
 // Duplicates a NickMode struct.
 func (nm *NickMode) Copy() *NickMode {
-	if nm == nil { return nil }
+	if nm == nil {
+		return nil
+	}
 	n := *nm
 	return &n
 }