Merge pull request #990 from ydb-platform/nakedret

asmyasnikov · web-flow · commit d5cf83e3a87c · 2023-12-31T04:07:18.000+03:00
nakedret enabled
diff --git a/.golangci.yml b/.golangci.yml
@@ -238,7 +238,6 @@ linters:
     - ireturn
     - maintidx
     - maligned
-    - nakedret
     - nilerr
     - nlreturn
     - nonamedreturns
diff --git a/examples/pagination/cities.go b/examples/pagination/cities.go
@@ -69,7 +69,7 @@ func selectPaging(
 			}()
 			if !res.NextResultSet(ctx) || !res.HasNextRow() {
 				empty = true
-				return
+				return res.Err()
 			}
 			var addr string
 			for res.NextRow() {
@@ -86,10 +86,7 @@ func selectPaging(
 			return res.Err()
 		},
 	)
-	if err != nil {
-		return
-	}
-	return empty, nil
+	return empty, err
 }
 
 func fillTableWithData(ctx context.Context, c table.Client, prefix string) (err error) {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func selectPaging(`
`69`	`69`	`}()`
`70`	`70`	`if !res.NextResultSet(ctx) \|\| !res.HasNextRow() {`
`71`	`71`	`empty = true`
`72`		`- return`
	`72`	`+ return res.Err()`
`73`	`73`	`}`
`74`	`74`	`var addr string`
`75`	`75`	`for res.NextRow() {`
`@@ -86,10 +86,7 @@ func selectPaging(`
`86`	`86`	`return res.Err()`
`87`	`87`	`},`
`88`	`88`	`)`
`89`		`- if err != nil {`
`90`		`- return`
`91`		`- }`
`92`		`- return empty, nil`
	`89`	`+ return empty, err`
`93`	`90`	`}`
`94`	`91`
`95`	`92`	`func fillTableWithData(ctx context.Context, c table.Client, prefix string) (err error) {`