diff --git a/.travis.yml b/.travis.yml index 4cbff6e..b0e346b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ install: - go get -u honnef.co/go/tools/cmd/staticcheck - go get -u honnef.co/go/tools/cmd/unused - go get -u github.com/mdempsky/unconvert + - go get -u github.com/gordonklaus/ineffassign script: - find . ! \( -path './vendor' -prune \) -type f -name '*.go' -print0 | xargs -0 gofmt -l -s - go vet $(go list ./... | grep -v /vendor/) @@ -18,3 +19,4 @@ script: - staticcheck $(go list ./... | grep -v /vendor/) - unused $(go list ./... | grep -v /vendor/) - unconvert $(go list ./... | grep -v /vendor/) + - ineffassign . diff --git a/cmd/commands/pack/pack.go b/cmd/commands/pack/pack.go index ee7eced..becddcc 100644 --- a/cmd/commands/pack/pack.go +++ b/cmd/commands/pack/pack.go @@ -417,7 +417,7 @@ func packDirectory(output io.Writer, excludePrefix []string, excludeSuffix []str func packApp(cmd *commands.Command, args []string) int { output := cmd.Out() curPath, _ := os.Getwd() - thePath := "" + var thePath string nArgs := []string{} has := false diff --git a/generate/g_appcode.go b/generate/g_appcode.go index fd6a3ed..f575568 100644 --- a/generate/g_appcode.go +++ b/generate/g_appcode.go @@ -503,9 +503,7 @@ func (mysqlDB *MysqlDB) GetColumns(db *sql.DB, table *Table, blackList map[strin // GetGoDataType maps an SQL data type to Golang data type func (*MysqlDB) GetGoDataType(sqlType string) (string, error) { - var typeMapping = map[string]string{} - typeMapping = typeMappingMysql - if v, ok := typeMapping[sqlType]; ok { + if v, ok := typeMappingMysql[sqlType]; ok { return v, nil } return "", fmt.Errorf("data type '%s' not found", sqlType) @@ -766,7 +764,7 @@ func writeModelFiles(tables []*Table, mPath string, selectedTables map[string]bo continue } } - template := "" + var template string if tb.Pk == "" { template = StructModelTPL } else { diff --git a/generate/g_hproseappcode.go b/generate/g_hproseappcode.go index f73d6ff..f6d352d 100644 --- a/generate/g_hproseappcode.go +++ b/generate/g_hproseappcode.go @@ -369,7 +369,7 @@ func writeHproseModelFiles(tables []*Table, mPath string, selectedTables map[str continue } } - template := "" + var template string if tb.Pk == "" { template = HproseStructModelTPL } else { diff --git a/generate/swaggergen/g_docs.go b/generate/swaggergen/g_docs.go index a9f1c0a..36dcec4 100644 --- a/generate/swaggergen/g_docs.go +++ b/generate/swaggergen/g_docs.go @@ -216,7 +216,7 @@ func GenerateDocs(curpath string) { for _, p := range params { switch pp := p.(type) { case *ast.CallExpr: - controllerName := "" + var controllerName string if selname := pp.Fun.(*ast.SelectorExpr).Sel.String(); selname == "NSNamespace" { s, params := analyseNewNamespace(pp) for _, sp := range params { @@ -298,12 +298,10 @@ func analyseNSInclude(baseurl string, ce *ast.CallExpr) string { } if apis, ok := controllerList[cname]; ok { for rt, item := range apis { - tag := "" + tag := cname if baseurl != "" { rt = baseurl + rt tag = strings.Trim(baseurl, "/") - } else { - tag = cname } if item.Get != nil { item.Get.Tags = []string{tag} @@ -749,7 +747,6 @@ func parseObject(d *ast.Object, k string, m *swagger.Schema, realTypes *[]string if st.Fields.List != nil { m.Properties = make(map[string]swagger.Propertie) for _, field := range st.Fields.List { - realType := "" isSlice, realType, sType := typeAnalyser(field) if (isSlice && isBasicType(realType)) || sType == "object" { if len(strings.Split(realType, " ")) > 1 { diff --git a/logger/colors/colorwriter_windows.go b/logger/colors/colorwriter_windows.go index d4c567a..67acb93 100644 --- a/logger/colors/colorwriter_windows.go +++ b/logger/colors/colorwriter_windows.go @@ -360,7 +360,7 @@ func isParameterChar(b byte) bool { } func (cw *colorWriter) Write(p []byte) (int, error) { - r, nw, first, last := 0, 0, 0, 0 + var r, nw, first, last int if cw.mode != DiscardNonColorEscSeq { cw.state = outsideCsiCode cw.resetBuffer()