Merge pull request #319 from kolyshkin/more-linters

CI: enable more linters

.golangci.yml

@@ -0,0 +1,7 @@
+# For documentation, see https://golangci-lint.run/usage/configuration/
+
+linters:
+  enable:
+    - gofumpt
+    - unconvert
+    - unparam

_examples/monitor.go

@@ -15,7 +15,7 @@ func main() {
 	}
 	defer conn.Close()
 
-	var rules = []string{
+	rules := []string{
 		"type='signal',member='Notify',path='/org/freedesktop/Notifications',interface='org.freedesktop.Notifications'",
 		"type='method_call',member='Notify',path='/org/freedesktop/Notifications',interface='org.freedesktop.Notifications'",
 		"type='method_return',member='Notify',path='/org/freedesktop/Notifications',interface='org.freedesktop.Notifications'",

conn.go

@@ -76,7 +76,6 @@ func SessionBus() (conn *Conn, err error) {
 func getSessionBusAddress(autolaunch bool) (string, error) {
 	if address := os.Getenv("DBUS_SESSION_BUS_ADDRESS"); address != "" && address != "autolaunch:" {
 		return address, nil
-
 	} else if address := tryDiscoverDbusSessionBusAddress(); address != "" {
 		os.Setenv("DBUS_SESSION_BUS_ADDRESS", address)
 		return address, nil
@@ -630,7 +629,7 @@ func (conn *Conn) AddMatchSignal(options ...MatchOption) error {
 
 // AddMatchSignalContext acts like AddMatchSignal but takes a context.
 func (conn *Conn) AddMatchSignalContext(ctx context.Context, options ...MatchOption) error {
-	options = append([]MatchOption{withMatchType("signal")}, options...)
+	options = append([]MatchOption{withMatchTypeSignal()}, options...)
 	return conn.busObj.CallWithContext(
 		ctx,
 		"org.freedesktop.DBus.AddMatch", 0,
@@ -645,7 +644,7 @@ func (conn *Conn) RemoveMatchSignal(options ...MatchOption) error {
 
 // RemoveMatchSignalContext acts like RemoveMatchSignal but takes a context.
 func (conn *Conn) RemoveMatchSignalContext(ctx context.Context, options ...MatchOption) error {
-	options = append([]MatchOption{withMatchType("signal")}, options...)
+	options = append([]MatchOption{withMatchTypeSignal()}, options...)
 	return conn.busObj.CallWithContext(
 		ctx,
 		"org.freedesktop.DBus.RemoveMatch", 0,
@@ -740,9 +739,7 @@ type transport interface {
 	SendMessage(*Message) error
 }
 
-var (
-	transports = make(map[string]func(string) (transport, error))
-)
+var transports = make(map[string]func(string) (transport, error))
 
 func getTransport(address string) (transport, error) {
 	var err error
@@ -853,16 +850,19 @@ type nameTracker struct {
 func newNameTracker() *nameTracker {
 	return &nameTracker{names: map[string]struct{}{}}
 }
+
 func (tracker *nameTracker) acquireUniqueConnectionName(name string) {
 	tracker.lck.Lock()
 	defer tracker.lck.Unlock()
 	tracker.unique = name
 }
+
 func (tracker *nameTracker) acquireName(name string) {
 	tracker.lck.Lock()
 	defer tracker.lck.Unlock()
 	tracker.names[name] = struct{}{}
 }
+
 func (tracker *nameTracker) loseName(name string) {
 	tracker.lck.Lock()
 	defer tracker.lck.Unlock()
@@ -874,12 +874,14 @@ func (tracker *nameTracker) uniqueNameIsKnown() bool {
 	defer tracker.lck.RUnlock()
 	return tracker.unique != ""
 }
+
 func (tracker *nameTracker) isKnownName(name string) bool {
 	tracker.lck.RLock()
 	defer tracker.lck.RUnlock()
 	_, ok := tracker.names[name]
 	return ok || name == tracker.unique
 }
+
 func (tracker *nameTracker) listKnownNames() []string {
 	tracker.lck.RLock()
 	defer tracker.lck.RUnlock()

conn_darwin.go

@@ -12,7 +12,6 @@ const defaultSystemBusAddress = "unix:path=/opt/local/var/run/dbus/system_bus_so
 func getSessionBusPlatformAddress() (string, error) {
 	cmd := exec.Command("launchctl", "getenv", "DBUS_LAUNCHD_SESSION_BUS_SOCKET")
 	b, err := cmd.CombinedOutput()
-
 	if err != nil {
 		return "", err
 	}

conn_other.go

@@ -20,7 +20,6 @@ var execCommand = exec.Command
 func getSessionBusPlatformAddress() (string, error) {
 	cmd := execCommand("dbus-launch")
 	b, err := cmd.CombinedOutput()
-
 	if err != nil {
 		return "", err
 	}

conn_test.go

@@ -279,7 +279,7 @@ func TestAddAndRemoveMatchSignalContext(t *testing.T) {
 	if err = conn.Emit("/", "org.test.CtxTest"); err != nil {
 		t.Fatal(err)
 	}
-	if sig := waitSignal(sigc, "org.test.CtxTest", time.Second); sig == nil {
+	if sig := waitSignal(sigc, "org.test.CtxTest"); sig == nil {
 		t.Fatal("signal receive timed out")
 	}
 
@@ -294,7 +294,7 @@ func TestAddAndRemoveMatchSignalContext(t *testing.T) {
 	if err = conn.Emit("/", "org.test.CtxTest"); err != nil {
 		t.Fatal(err)
 	}
-	if sig := waitSignal(sigc, "org.test.CtxTest", time.Second); sig != nil {
+	if sig := waitSignal(sigc, "org.test.CtxTest"); sig != nil {
 		t.Fatalf("unsubscribed from %q signal, but received %#v", "org.test.CtxTest", sig)
 	}
 }
@@ -319,7 +319,7 @@ func TestAddAndRemoveMatchSignal(t *testing.T) {
 	if err = conn.Emit("/", "org.test.Test"); err != nil {
 		t.Fatal(err)
 	}
-	if sig := waitSignal(sigc, "org.test.Test", time.Second); sig == nil {
+	if sig := waitSignal(sigc, "org.test.Test"); sig == nil {
 		t.Fatal("signal receive timed out")
 	}
 
@@ -333,19 +333,19 @@ func TestAddAndRemoveMatchSignal(t *testing.T) {
 	if err = conn.Emit("/", "org.test.Test"); err != nil {
 		t.Fatal(err)
 	}
-	if sig := waitSignal(sigc, "org.test.Test", time.Second); sig != nil {
+	if sig := waitSignal(sigc, "org.test.Test"); sig != nil {
 		t.Fatalf("unsubscribed from %q signal, but received %#v", "org.test.Test", sig)
 	}
 }
 
-func waitSignal(sigc <-chan *Signal, name string, timeout time.Duration) *Signal {
+func waitSignal(sigc <-chan *Signal, name string) *Signal {
 	for {
 		select {
 		case sig := <-sigc:
 			if sig.Name == name {
 				return sig
 			}
-		case <-time.After(timeout):
+		case <-time.After(time.Second):
 			return nil
 		}
 	}

dbus.go

@@ -82,7 +82,7 @@ func storeBase(dest, src reflect.Value) error {
 
 func setDest(dest, src reflect.Value) error {
 	if !isVariant(src.Type()) && isVariant(dest.Type()) {
-		//special conversion for dbus.Variant
+		// special conversion for dbus.Variant
 		dest.Set(reflect.ValueOf(MakeVariant(src.Interface())))
 		return nil
 	}
@@ -163,8 +163,8 @@ func storeMapIntoVariant(dest, src reflect.Value) error {
 func storeMapIntoInterface(dest, src reflect.Value) error {
 	var dv reflect.Value
 	if isVariant(src.Type().Elem()) {
-		//Convert variants to interface{} recursively when converting
-		//to interface{}
+		// Convert variants to interface{} recursively when converting
+		// to interface{}
 		dv = reflect.MakeMap(
 			reflect.MapOf(src.Type().Key(), interfaceType))
 	} else {
@@ -197,7 +197,7 @@ func storeMapIntoMap(dest, src reflect.Value) error {
 func storeSlice(dest, src reflect.Value) error {
 	switch {
 	case src.Type() == interfacesType && dest.Kind() == reflect.Struct:
-		//The decoder always decodes structs as slices of interface{}
+		// The decoder always decodes structs as slices of interface{}
 		return storeStruct(dest, src)
 	case !kindsAreCompatible(dest.Type(), src.Type()):
 		return fmt.Errorf(
@@ -257,8 +257,8 @@ func storeSliceIntoVariant(dest, src reflect.Value) error {
 func storeSliceIntoInterface(dest, src reflect.Value) error {
 	var dv reflect.Value
 	if isVariant(src.Type().Elem()) {
-		//Convert variants to interface{} recursively when converting
-		//to interface{}
+		// Convert variants to interface{} recursively when converting
+		// to interface{}
 		dv = reflect.MakeSlice(reflect.SliceOf(interfaceType),
 			src.Len(), src.Cap())
 	} else {

decoder.go

@@ -205,9 +205,9 @@ func (dec *decoder) decode(s string, depth int) interface{} {
 		// Even for empty arrays, the correct padding must be included
 		align := alignment(typeFor(s[1:]))
 		if len(s) > 1 && s[1] == '(' {
-			//Special case for arrays of structs
-			//structs decode as a slice of interface{} values
-			//but the dbus alignment does not match this
+			// Special case for arrays of structs
+			// structs decode as a slice of interface{} values
+			// but the dbus alignment does not match this
 			align = 8
 		}
 		dec.align(align)

default_handler.go

@@ -148,7 +148,7 @@ func (m exportedMethod) Call(args ...interface{}) ([]interface{}, error) {
 		out[i] = val.Interface()
 	}
 	if nilErr || err == nil {
-		//concrete type to interface nil is a special case
+		// concrete type to interface nil is a special case
 		return out, nil
 	}
 	return out, err

exec_command_test.go

@@ -10,17 +10,21 @@ import (
 // How to mock exec.Command for unit tests
 // https://stackoverflow.com/q/45789101/10513533
 
-var mockedExitStatus = 0
-var mockedStdout string
+var (
+	mockedExitStatus = 0
+	mockedStdout     string
+)
 
 func fakeExecCommand(command string, args ...string) *exec.Cmd {
 	cs := []string{"-test.run=TestExecCommandHelper", "--", command}
 	cs = append(cs, args...)
 	cmd := exec.Command(os.Args[0], cs...)
 	es := strconv.Itoa(mockedExitStatus)
-	cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1",
+	cmd.Env = []string{
+		"GO_WANT_HELPER_PROCESS=1",
 		"STDOUT=" + mockedStdout,
-		"EXIT_STATUS=" + es}
+		"EXIT_STATUS=" + es,
+	}
 	return cmd
 }
 

match.go

@@ -26,10 +26,10 @@ func WithMatchOption(key, value string) MatchOption {
 	return MatchOption{key, value}
 }
 
-// doesn't make sense to export this option because clients can only
-// subscribe to messages with signal type.
-func withMatchType(typ string) MatchOption {
-	return WithMatchOption("type", typ)
+// It does not make sense to have a public WithMatchType function
+// because clients can only subscribe to messages with signal type.
+func withMatchTypeSignal() MatchOption {
+	return WithMatchOption("type", "signal")
 }
 
 // WithMatchSender sets sender match option.

match_test.go

@@ -4,7 +4,7 @@ import "testing"
 
 func TestFormatMatchOptions(t *testing.T) {
 	opts := []MatchOption{
-		withMatchType("signal"),
+		withMatchTypeSignal(),
 		WithMatchSender("org.bluez"),
 		WithMatchInterface("org.freedesktop.DBus.Properties"),
 		WithMatchMember("PropertiesChanged"),

message_test.go

@@ -3,7 +3,7 @@ package dbus
 import "testing"
 
 func TestMessage_validateHeader(t *testing.T) {
-	var tcs = []struct {
+	tcs := []struct {
 		msg Message
 		err error
 	}{
@@ -85,7 +85,6 @@ func TestMessage_validateHeader(t *testing.T) {
 			err: InvalidMessageError("invalid error name"),
 		},
 		{
-
 			msg: Message{
 				Type: TypeError,
 				Headers: map[HeaderField]Variant{

object.go

@@ -46,7 +46,7 @@ func (o *Object) CallWithContext(ctx context.Context, method string, flags Flags
 // Deprecated: use (*Conn) AddMatchSignal instead.
 func (o *Object) AddMatchSignal(iface, member string, options ...MatchOption) *Call {
 	base := []MatchOption{
-		withMatchType("signal"),
+		withMatchTypeSignal(),
 		WithMatchInterface(iface),
 		WithMatchMember(member),
 	}
@@ -65,7 +65,7 @@ func (o *Object) AddMatchSignal(iface, member string, options ...MatchOption) *C
 // Deprecated: use (*Conn) RemoveMatchSignal instead.
 func (o *Object) RemoveMatchSignal(iface, member string, options ...MatchOption) *Call {
 	base := []MatchOption{
-		withMatchType("signal"),
+		withMatchTypeSignal(),
 		WithMatchInterface(iface),
 		WithMatchMember(member),
 	}

prop/prop.go

@@ -148,7 +148,7 @@ type Prop struct {
 // Introspection returns the introspection data for p.
 // The "name" argument is used as the property's name in the resulting data.
 func (p *Prop) Introspection(name string) introspect.Property {
-	var result = introspect.Property{Name: name, Type: dbus.SignatureOf(p.Value).String()}
+	result := introspect.Property{Name: name, Type: dbus.SignatureOf(p.Value).String()}
 	if p.Writable {
 		result.Access = "readwrite"
 	} else {

sequential_handler_test.go

@@ -2,8 +2,6 @@ package dbus
 
 import (
 	"context"
-	"errors"
-	"fmt"
 	"testing"
 	"time"
 )
@@ -20,9 +18,7 @@ func TestSequentialHandlerNoDrop(t *testing.T) {
 
 	writeSignals(handler, 1000)
 
-	if err := readSignals(t, channel, 1000); err != nil {
-		t.Error(err)
-	}
+	readSignals(t, channel)
 }
 
 // Verifies that signals are written to the destination channel in the
@@ -39,9 +35,7 @@ func TestSequentialHandlerSequential(t *testing.T) {
 
 	// Concurrently read and write signals
 	go func() {
-		if err := readSignals(t, channel, 1000); err != nil {
-			t.Error(err)
-		}
+		readSignals(t, channel)
 		close(done)
 	}()
 	writeSignals(handler, 1000)
@@ -63,9 +57,7 @@ func TestSequentialHandlerMultipleChannel(t *testing.T) {
 
 	writeSignals(handler, 1000)
 
-	if err := readSignals(t, channelTwo, 1000); err != nil {
-		t.Error(err)
-	}
+	readSignals(t, channelTwo)
 }
 
 // Test that removing one channel results in no more messages being
@@ -119,14 +111,10 @@ func TestSequentialHandler_RemoveOneChannelOfMany(t *testing.T) {
 	}
 
 	// Check that closing channel two does not close channel one.
-	if err := readSignals(t, channelOne, 1000); err != nil {
-		t.Error(err)
-	}
+	readSignals(t, channelOne)
 
 	// Check that closing channel two does not close channel three.
-	if err := readSignals(t, channelThree, 1000); err != nil {
-		t.Error(err)
-	}
+	readSignals(t, channelThree)
 }
 
 // Test that Terminate() closes all channels that were attached at the time.
@@ -221,21 +209,22 @@ func writeSignals(handler SignalHandler, count int) {
 	}
 }
 
-func readSignals(t *testing.T, channel <-chan *Signal, count int) error {
+func readSignals(t *testing.T, channel <-chan *Signal) {
 	// Overly generous timeout
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
-	for i := 1; i <= count; i++ {
+	for i := 1; i <= 1000; i++ {
 		select {
 		case signal := <-channel:
 			if signal.Sequence != Sequence(i) {
-				return fmt.Errorf("Received signal out of order. Expected %v, got %v", i, signal.Sequence)
+				t.Errorf("Received signal out of order. Expected %v, got %v", i, signal.Sequence)
+				return
 			}
 		case <-ctx.Done():
-			return errors.New("Timeout occurred before all messages received")
+			t.Error("Timeout occurred before all messages received")
+			return
 		}
 	}
-	return nil
 }
 
 func countSignals(channel <-chan *Signal) (count int, closed bool) {