diff options
| author | Duco van Amstel <duco.vanamstel@gmail.com> | 2018-11-15 18:24:22 +0000 |
|---|---|---|
| committer | Wim <wim@42.be> | 2018-11-15 19:24:22 +0100 |
| commit | c89085bf44333b4decd75e30cec5849dca859938 (patch) | |
| tree | c15f512e7f79a0cba9eab41069a5b3d5d3349c70 | |
| parent | 4254ed3c638d0378d71c49918f241582ea30dc97 (diff) | |
| download | matterbridge-msglm-c89085bf44333b4decd75e30cec5849dca859938.tar.gz matterbridge-msglm-c89085bf44333b4decd75e30cec5849dca859938.tar.bz2 matterbridge-msglm-c89085bf44333b4decd75e30cec5849dca859938.zip | |
Fix and enable goimports linter (#591)
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | bridge/steam/steam.go | 7 | ||||
| -rw-r--r-- | matterclient/matterclient.go | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 8497a4e8..a2b69c87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ before_script: - PKGS=$(go list ./... | grep -v /vendor/) # All the import paths, excluding vendor/ # - go get github.com/golang/lint/golint # Linter #- go get honnef.co/go/tools/cmd/megacheck # Badass static analyzer/linter - - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.12 + - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.12.2 # Anything in before_script: that returns a nonzero exit code will @@ -40,7 +40,7 @@ script: #- test -z "$(go fmt ./...)" # Fail if a .go file hasn't been formatted with gofmt - go test -v -race $PKGS # Run all the tests with the race detector enabled #- go vet $PKGS # go vet is the official Go static analyzer - - golangci-lint run --enable-all -D golint -D lll -D errcheck -D goimports -D gosec -D maligned -D prealloc -D gocyclo -D gochecknoglobals + - golangci-lint run --enable-all -D golint -D lll -D errcheck -D gosec -D maligned -D prealloc -D gocyclo -D gochecknoglobals #- megacheck $PKGS # "go vet on steroids" + linter - /bin/bash ci/bintray.sh #- golint -set_exit_status $PKGS # one last linter diff --git a/bridge/steam/steam.go b/bridge/steam/steam.go index a35a9d5d..b04c10be 100644 --- a/bridge/steam/steam.go +++ b/bridge/steam/steam.go @@ -2,6 +2,9 @@ package bsteam import ( "fmt" + "strconv" + "sync" + "time" "github.com/42wim/matterbridge/bridge" "github.com/42wim/matterbridge/bridge/config" @@ -9,10 +12,6 @@ import ( "github.com/Philipp15b/go-steam" "github.com/Philipp15b/go-steam/protocol/steamlang" "github.com/Philipp15b/go-steam/steamid" - //"io/ioutil" - "strconv" - "sync" - "time" ) type Bsteam struct { diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go index ae7cd94b..edd298db 100644 --- a/matterclient/matterclient.go +++ b/matterclient/matterclient.go @@ -13,13 +13,12 @@ import ( "sync" "time" - prefixed "github.com/matterbridge/logrus-prefixed-formatter" - log "github.com/sirupsen/logrus" - "github.com/gorilla/websocket" "github.com/hashicorp/golang-lru" "github.com/jpillora/backoff" + prefixed "github.com/matterbridge/logrus-prefixed-formatter" "github.com/mattermost/platform/model" + log "github.com/sirupsen/logrus" ) type Credentials struct { |