mirror of
https://github.com/minio/minio.git
synced 2025-11-07 21:02:58 -05:00
add gocritic/ruleguard checks back again, cleanup code. (#13665)
- remove some duplicated code - reported a bug, separately fixed in #13664 - using strings.ReplaceAll() when needed - using filepath.ToSlash() use when needed - remove all non-Go style comments from the codebase Co-authored-by: Aditya Manthramurthy <donatello@users.noreply.github.com>
This commit is contained in:
@@ -22,7 +22,6 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"strings"
|
||||
"testing"
|
||||
@@ -89,7 +88,7 @@ type tester interface {
|
||||
}
|
||||
|
||||
func openTestFile(t tester, file string) []byte {
|
||||
f, err := ioutil.ReadFile(filepath.Join("testdata/testdata.zip"))
|
||||
f, err := ioutil.ReadFile("testdata/testdata.zip")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
@@ -103,7 +103,7 @@ func (r *Record) Set(name string, value *sql.Value) (sql.Record, error) {
|
||||
return nil, fmt.Errorf("unsupported sql value %v and type %v", value, value.GetTypeString())
|
||||
}
|
||||
|
||||
name = strings.Replace(name, "*", "__ALL__", -1)
|
||||
name = strings.ReplaceAll(name, "*", "__ALL__")
|
||||
r.KVS = append(r.KVS, jstream.KV{Key: name, Value: v})
|
||||
return r, nil
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ func TestNDJSON(t *testing.T) {
|
||||
if false {
|
||||
t.Log(string(b))
|
||||
}
|
||||
//_ = ioutil.WriteFile(filepath.Join("testdata", tt.name+".json"), b, os.ModePerm)
|
||||
// _ = ioutil.WriteFile(filepath.Join("testdata", tt.name+".json"), b, os.ModePerm)
|
||||
|
||||
parser:
|
||||
for {
|
||||
|
||||
@@ -44,7 +44,7 @@ func (ls *LiteralString) Capture(values []string) error {
|
||||
n := len(values[0])
|
||||
r := values[0][1 : n-1]
|
||||
// Translate doubled quotes
|
||||
*ls = LiteralString(strings.Replace(r, "''", "'", -1))
|
||||
*ls = LiteralString(strings.ReplaceAll(r, "''", "'"))
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ func (qi *QuotedIdentifier) Capture(values []string) error {
|
||||
r := values[0][1 : n-1]
|
||||
|
||||
// Translate doubled quotes
|
||||
*qi = QuotedIdentifier(strings.Replace(r, `""`, `"`, -1))
|
||||
*qi = QuotedIdentifier(strings.ReplaceAll(r, `""`, `"`))
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -231,6 +231,7 @@ func (v Value) ToArray() (val []Value, ok bool) {
|
||||
|
||||
// IsNull - checks if value is missing.
|
||||
func (v Value) IsNull() bool {
|
||||
//nolint:gocritic
|
||||
switch v.value.(type) {
|
||||
case nil:
|
||||
return true
|
||||
@@ -245,6 +246,7 @@ func (v Value) IsArray() (ok bool) {
|
||||
}
|
||||
|
||||
func (v Value) isNumeric() bool {
|
||||
//nolint:gocritic
|
||||
switch v.value.(type) {
|
||||
case int64, float64:
|
||||
return true
|
||||
|
||||
Reference in New Issue
Block a user