fix lint (#1953)

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1953
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>

.revive.toml

@@ -8,20 +8,22 @@ warningCode = 1
 [rule.context-as-argument]
 [rule.context-keys-type]
 [rule.dot-imports]
+[rule.empty-lines]
+[rule.errorf]
 [rule.error-return]
 [rule.error-strings]
 [rule.error-naming]
 [rule.exported]
 [rule.if-return]
 [rule.increment-decrement]
-[rule.var-naming]
+[rule.indent-error-flow]
-  arguments = [["ID", "UID", "UUID", "URL", "JSON"], []]
-[rule.var-declaration]
 [rule.package-comments]
 [rule.range]
 [rule.receiver-naming]
+[rule.struct-tag]
 [rule.time-naming]
 [rule.unexported-return]
-[rule.indent-error-flow]
+[rule.unnecessary-stmt]
-[rule.errorf]
+[rule.var-declaration]
-[rule.struct-tag]
+[rule.var-naming]
+  arguments = [["ID", "UID", "UUID", "URL", "JSON"], []]

convert.go

@@ -416,7 +416,3 @@ func int64ToIntValue(id int64, tp reflect.Type) reflect.Value {
 	}
 	return reflect.ValueOf(v).Elem().Convert(tp)
 }
-
-func int64ToInt(id int64, tp reflect.Type) interface{} {
-	return int64ToIntValue(id, tp).Interface()
-}

integrations/session_insert_test.go

@@ -32,7 +32,6 @@ func TestInsertOne(t *testing.T) {
 }
 
 func TestInsertMulti(t *testing.T) {
-
 	assert.NoError(t, PrepareEngine())
 	type TestMulti struct {
 		Id   int64  `xorm:"int(11) pk"`
@@ -78,7 +77,6 @@ func insertMultiDatas(step int, datas interface{}) (num int64, err error) {
 }
 
 func callbackLooper(datas interface{}, step int, actionFunc func(interface{}) error) (err error) {
-
 	sliceValue := reflect.Indirect(reflect.ValueOf(datas))
 	if sliceValue.Kind() != reflect.Slice {
 		return fmt.Errorf("not slice")

internal/statements/expr.go

@@ -27,6 +27,7 @@ type Expr struct {
 	Arg     interface{}
 }
 
+// WriteArgs writes args to the writer
 func (expr *Expr) WriteArgs(w *builder.BytesWriter) error {
 	switch arg := expr.Arg.(type) {
 	case *builder.Builder:

internal/statements/query.go

@@ -343,7 +343,7 @@ func (statement *Statement) GenExistSQL(bean ...interface{}) (string, []interfac
 	var args []interface{}
 	var joinStr string
 	var err error
-	var b interface{} = nil
+	var b interface{}
 	if len(bean) > 0 {
 		b = bean[0]
 		beanValue := reflect.ValueOf(bean[0])

internal/statements/statement_test.go

@@ -78,7 +78,6 @@ func TestColumnsStringGeneration(t *testing.T) {
 }
 
 func BenchmarkGetFlagForColumnWithICKey_ContainsKey(b *testing.B) {
-
 	b.StopTimer()
 
 	mapCols := make(map[string]bool)
@@ -101,9 +100,7 @@ func BenchmarkGetFlagForColumnWithICKey_ContainsKey(b *testing.B) {
 	b.StartTimer()
 
 	for i := 0; i < b.N; i++ {
-
 		for _, col := range cols {
-
 			if _, ok := getFlagForColumn(mapCols, col); !ok {
 				b.Fatal("Unexpected result")
 			}
@@ -112,7 +109,6 @@ func BenchmarkGetFlagForColumnWithICKey_ContainsKey(b *testing.B) {
 }
 
 func BenchmarkGetFlagForColumnWithICKey_EmptyMap(b *testing.B) {
-
 	b.StopTimer()
 
 	mapCols := make(map[string]bool)
@@ -131,9 +127,7 @@ func BenchmarkGetFlagForColumnWithICKey_EmptyMap(b *testing.B) {
 	b.StartTimer()
 
 	for i := 0; i < b.N; i++ {
-
 		for _, col := range cols {
-
 			if _, ok := getFlagForColumn(mapCols, col); ok {
 				b.Fatal("Unexpected result")
 			}

log/logger.go

@@ -132,7 +132,6 @@ func (s *SimpleLogger) Error(v ...interface{}) {
 	if s.level <= LOG_ERR {
 		s.ERR.Output(2, fmt.Sprintln(v...))
 	}
-	return
 }
 
 // Errorf implement ILogger
@@ -140,7 +139,6 @@ func (s *SimpleLogger) Errorf(format string, v ...interface{}) {
 	if s.level <= LOG_ERR {
 		s.ERR.Output(2, fmt.Sprintf(format, v...))
 	}
-	return
 }
 
 // Debug implement ILogger
@@ -148,7 +146,6 @@ func (s *SimpleLogger) Debug(v ...interface{}) {
 	if s.level <= LOG_DEBUG {
 		s.DEBUG.Output(2, fmt.Sprintln(v...))
 	}
-	return
 }
 
 // Debugf implement ILogger
@@ -156,7 +153,6 @@ func (s *SimpleLogger) Debugf(format string, v ...interface{}) {
 	if s.level <= LOG_DEBUG {
 		s.DEBUG.Output(2, fmt.Sprintf(format, v...))
 	}
-	return
 }
 
 // Info implement ILogger
@@ -164,7 +160,6 @@ func (s *SimpleLogger) Info(v ...interface{}) {
 	if s.level <= LOG_INFO {
 		s.INFO.Output(2, fmt.Sprintln(v...))
 	}
-	return
 }
 
 // Infof implement ILogger
@@ -172,7 +167,6 @@ func (s *SimpleLogger) Infof(format string, v ...interface{}) {
 	if s.level <= LOG_INFO {
 		s.INFO.Output(2, fmt.Sprintf(format, v...))
 	}
-	return
 }
 
 // Warn implement ILogger
@@ -180,7 +174,6 @@ func (s *SimpleLogger) Warn(v ...interface{}) {
 	if s.level <= LOG_WARNING {
 		s.WARN.Output(2, fmt.Sprintln(v...))
 	}
-	return
 }
 
 // Warnf implement ILogger
@@ -188,7 +181,6 @@ func (s *SimpleLogger) Warnf(format string, v ...interface{}) {
 	if s.level <= LOG_WARNING {
 		s.WARN.Output(2, fmt.Sprintf(format, v...))
 	}
-	return
 }
 
 // Level implement ILogger
@@ -199,7 +191,6 @@ func (s *SimpleLogger) Level() LogLevel {
 // SetLevel implement ILogger
 func (s *SimpleLogger) SetLevel(l LogLevel) {
 	s.level = l
-	return
 }
 
 // ShowSQL implement ILogger

schemas/table_test.go

@@ -27,7 +27,6 @@ var testsGetColumn = []struct {
 var table *Table
 
 func init() {
-
 	table = NewEmptyTable()
 
 	var name string
@@ -41,7 +40,6 @@ func init() {
 }
 
 func TestGetColumn(t *testing.T) {
-
 	for _, test := range testsGetColumn {
 		if table.GetColumn(test.name) == nil {
 			t.Error("Column not found!")
@@ -50,7 +48,6 @@ func TestGetColumn(t *testing.T) {
 }
 
 func TestGetColumnIdx(t *testing.T) {
-
 	for _, test := range testsGetColumn {
 		if table.GetColumnIdx(test.name, test.idx) == nil {
 			t.Errorf("Column %s with idx %d not found!", test.name, test.idx)
@@ -59,7 +56,6 @@ func TestGetColumnIdx(t *testing.T) {
 }
 
 func BenchmarkGetColumnWithToLower(b *testing.B) {
-
 	for i := 0; i < b.N; i++ {
 		for _, test := range testsGetColumn {
 
@@ -71,7 +67,6 @@ func BenchmarkGetColumnWithToLower(b *testing.B) {
 }
 
 func BenchmarkGetColumnIdxWithToLower(b *testing.B) {
-
 	for i := 0; i < b.N; i++ {
 		for _, test := range testsGetColumn {
 
@@ -89,7 +84,6 @@ func BenchmarkGetColumnIdxWithToLower(b *testing.B) {
 }
 
 func BenchmarkGetColumn(b *testing.B) {
-
 	for i := 0; i < b.N; i++ {
 		for _, test := range testsGetColumn {
 			if table.GetColumn(test.name) == nil {
@@ -100,7 +94,6 @@ func BenchmarkGetColumn(b *testing.B) {
 }
 
 func BenchmarkGetColumnIdx(b *testing.B) {
-
 	for i := 0; i < b.N; i++ {
 		for _, test := range testsGetColumn {
 			if table.GetColumnIdx(test.name, test.idx) == nil {

session_update.go

@@ -457,7 +457,6 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
 				// FIXME: if bean is a map type, it will panic because map cannot be as map key
 				session.afterUpdateBeans[bean] = &afterClosures
 			}
-
 		} else {
 			if _, ok := interface{}(bean).(AfterUpdateProcessor); ok {
 				session.afterUpdateBeans[bean] = nil