Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavlo Strokov <pstrokov@gitlab.com>2020-03-24 14:38:15 +0300
committerPavlo Strokov <pstrokov@gitlab.com>2020-03-24 14:38:15 +0300
commit079051b0e9208d77feaae498cf4f27caeccc75cf (patch)
tree9462e5be95ba9156014cab04deda4318b7a5e19a
parent768dda7a784657a05596c4925a0b3dd6d196ce3e (diff)
parentd077e4084a4ca3416efc3da8ecd3033c3b17409c (diff)
Merge branch 'jv-prefer-address-of-literal' into 'master'
Replace calls to new with address of literal See merge request gitlab-org/gitaly!1963
-rw-r--r--internal/cache/export_test.go6
-rw-r--r--internal/git/stats/packfile_negotiation_test.go30
-rw-r--r--internal/praefect/grpc-proxy/proxy/peeker_test.go4
-rw-r--r--internal/praefect/protoregistry/protoregistry.go2
-rw-r--r--internal/service/inspect/inspector_test.go2
-rw-r--r--internal/service/objectpool/fetch_into_object_pool_test.go2
-rw-r--r--internal/service/repository/calculate_checksum.go2
-rw-r--r--internal/service/repository/fork_test.go2
-rw-r--r--internal/service/repository/gc_test.go2
-rw-r--r--internal/service/repository/repack_test.go4
-rw-r--r--internal/stats/git_test.go2
-rw-r--r--proto/go/internal/cmd/protoc-gen-gitaly/main.go4
-rw-r--r--proto/go/internal/filedescriptor.go2
13 files changed, 32 insertions, 32 deletions
diff --git a/internal/cache/export_test.go b/internal/cache/export_test.go
index 2f1538e45..f1203b71c 100644
--- a/internal/cache/export_test.go
+++ b/internal/cache/export_test.go
@@ -3,9 +3,9 @@ package cache
import "sync"
var (
- ExportMockRemovalCounter = new(mockCounter)
- ExportMockCheckCounter = new(mockCounter)
- ExportMockLoserBytes = new(mockCounter)
+ ExportMockRemovalCounter = &mockCounter{}
+ ExportMockCheckCounter = &mockCounter{}
+ ExportMockLoserBytes = &mockCounter{}
ExportDisableMoveAndClear = &disableMoveAndClear
ExportDisableWalker = &disableWalker
diff --git a/internal/git/stats/packfile_negotiation_test.go b/internal/git/stats/packfile_negotiation_test.go
index 903a00b08..dab22f62c 100644
--- a/internal/git/stats/packfile_negotiation_test.go
+++ b/internal/git/stats/packfile_negotiation_test.go
@@ -24,7 +24,7 @@ func requireParses(t *testing.T, reader io.Reader, expected PackfileNegotiation)
}
func TestPackNegoWithInvalidPktline(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap")
pktline.WriteFlush(buf)
// Write string with invalid length
@@ -36,7 +36,7 @@ func TestPackNegoWithInvalidPktline(t *testing.T) {
}
func TestPackNegoWithSingleWant(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap")
pktline.WriteFlush(buf)
pktline.WriteString(buf, "done")
@@ -47,7 +47,7 @@ func TestPackNegoWithSingleWant(t *testing.T) {
}
func TestPackNegoWithMissingCaps(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1)
pktline.WriteFlush(buf)
pktline.WriteString(buf, "done")
@@ -58,7 +58,7 @@ func TestPackNegoWithMissingCaps(t *testing.T) {
}
func TestPackNegoWithMissingWant(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "have "+oid2)
pktline.WriteString(buf, "done")
@@ -67,7 +67,7 @@ func TestPackNegoWithMissingWant(t *testing.T) {
}
func TestPackNegoWithHave(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap")
pktline.WriteFlush(buf)
pktline.WriteString(buf, "have "+oid2)
@@ -79,7 +79,7 @@ func TestPackNegoWithHave(t *testing.T) {
}
func TestPackNegoWithMultipleHaveRoundds(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap")
pktline.WriteFlush(buf)
pktline.WriteString(buf, "have "+oid2)
@@ -96,7 +96,7 @@ func TestPackNegoWithMultipleHaveRoundds(t *testing.T) {
}
func TestPackNegoWithMultipleWants(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap")
pktline.WriteString(buf, "want "+oid2)
pktline.WriteFlush(buf)
@@ -108,7 +108,7 @@ func TestPackNegoWithMultipleWants(t *testing.T) {
}
func TestPackNegoWithMultipleCapLines(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap1")
pktline.WriteString(buf, "want "+oid2+" cap2")
pktline.WriteFlush(buf)
@@ -119,7 +119,7 @@ func TestPackNegoWithMultipleCapLines(t *testing.T) {
}
func TestPackNegoWithDeepen(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap")
pktline.WriteString(buf, "deepen 1")
pktline.WriteFlush(buf)
@@ -133,7 +133,7 @@ func TestPackNegoWithDeepen(t *testing.T) {
}
func TestPackNegoWithMultipleDeepens(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap")
pktline.WriteFlush(buf)
pktline.WriteString(buf, "deepen 1")
@@ -149,7 +149,7 @@ func TestPackNegoWithMultipleDeepens(t *testing.T) {
}
func TestPackNegoWithShallow(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap")
pktline.WriteString(buf, "shallow "+oid1)
pktline.WriteFlush(buf)
@@ -163,7 +163,7 @@ func TestPackNegoWithShallow(t *testing.T) {
}
func TestPackNegoWithMultipleShallows(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap")
pktline.WriteString(buf, "shallow "+oid1)
pktline.WriteString(buf, "shallow "+oid2)
@@ -178,7 +178,7 @@ func TestPackNegoWithMultipleShallows(t *testing.T) {
}
func TestPackNegoWithFilter(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap")
pktline.WriteString(buf, "filter blob:none")
pktline.WriteFlush(buf)
@@ -192,7 +192,7 @@ func TestPackNegoWithFilter(t *testing.T) {
}
func TestPackNegoWithMultipleFilters(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap")
pktline.WriteString(buf, "filter blob:none")
pktline.WriteString(buf, "filter blob:limit=1m")
@@ -207,7 +207,7 @@ func TestPackNegoWithMultipleFilters(t *testing.T) {
}
func TestPackNegoFullBlown(t *testing.T) {
- buf := new(bytes.Buffer)
+ buf := &bytes.Buffer{}
pktline.WriteString(buf, "want "+oid1+" cap1 cap2")
pktline.WriteString(buf, "want "+oid2)
pktline.WriteString(buf, "shallow "+oid2)
diff --git a/internal/praefect/grpc-proxy/proxy/peeker_test.go b/internal/praefect/grpc-proxy/proxy/peeker_test.go
index d6efb9fb7..b5d882ff4 100644
--- a/internal/praefect/grpc-proxy/proxy/peeker_test.go
+++ b/internal/praefect/grpc-proxy/proxy/peeker_test.go
@@ -32,7 +32,7 @@ func TestStreamPeeking(t *testing.T) {
peekedMsg, err := peeker.Peek()
require.NoError(t, err)
- peekedRequest := new(testservice.PingRequest)
+ peekedRequest := &testservice.PingRequest{}
err = proto.Unmarshal(peekedMsg, peekedRequest)
require.NoError(t, err)
require.True(t, proto.Equal(pingReqSent, peekedRequest), "expected to be the same")
@@ -91,7 +91,7 @@ func TestStreamInjecting(t *testing.T) {
peekedMsg, err := peeker.Peek()
require.NoError(t, err)
- peekedRequest := new(testservice.PingRequest)
+ peekedRequest := &testservice.PingRequest{}
require.NoError(t, proto.Unmarshal(peekedMsg, peekedRequest))
require.Equal(t, "hi", peekedRequest.GetValue())
diff --git a/internal/praefect/protoregistry/protoregistry.go b/internal/praefect/protoregistry/protoregistry.go
index 3fd3d64c2..5ffb6a884 100644
--- a/internal/praefect/protoregistry/protoregistry.go
+++ b/internal/praefect/protoregistry/protoregistry.go
@@ -497,7 +497,7 @@ func ExtractFileDescriptor(gz []byte) (*descriptor.FileDescriptorProto, error) {
return nil, fmt.Errorf("failed to uncompress descriptor: %v", err)
}
- fd := new(descriptor.FileDescriptorProto)
+ fd := &descriptor.FileDescriptorProto{}
if err := proto.Unmarshal(b, fd); err != nil {
return nil, fmt.Errorf("malformed FileDescriptorProto: %v", err)
}
diff --git a/internal/service/inspect/inspector_test.go b/internal/service/inspect/inspector_test.go
index 751ace6e2..33f6385bc 100644
--- a/internal/service/inspect/inspector_test.go
+++ b/internal/service/inspect/inspector_test.go
@@ -99,7 +99,7 @@ func TestLogPackInfoStatistic(t *testing.T) {
dest := &bytes.Buffer{}
log := &logrus.Logger{
Out: dest,
- Formatter: new(logrus.JSONFormatter),
+ Formatter: &logrus.JSONFormatter{},
Level: logrus.InfoLevel,
}
ctx := ctxlogrus.ToContext(context.Background(), log.WithField("test", "logging"))
diff --git a/internal/service/objectpool/fetch_into_object_pool_test.go b/internal/service/objectpool/fetch_into_object_pool_test.go
index 280b60f20..d689c0215 100644
--- a/internal/service/objectpool/fetch_into_object_pool_test.go
+++ b/internal/service/objectpool/fetch_into_object_pool_test.go
@@ -71,7 +71,7 @@ func TestFetchIntoObjectPool_CollectLogStatistics(t *testing.T) {
logBuffer := &bytes.Buffer{}
testhelper.NewTestLogger = func(tb testhelper.TB) *logrus.Logger {
- return &logrus.Logger{Out: logBuffer, Formatter: new(logrus.JSONFormatter), Level: logrus.InfoLevel}
+ return &logrus.Logger{Out: logBuffer, Formatter: &logrus.JSONFormatter{}, Level: logrus.InfoLevel}
}
ctx, cancel := testhelper.Context()
diff --git a/internal/service/repository/calculate_checksum.go b/internal/service/repository/calculate_checksum.go
index 502295b39..6dc051e6f 100644
--- a/internal/service/repository/calculate_checksum.go
+++ b/internal/service/repository/calculate_checksum.go
@@ -53,7 +53,7 @@ func (s *server) CalculateChecksum(ctx context.Context, in *gitalypb.CalculateCh
h.Write(ref)
hash := hex.EncodeToString(h.Sum(nil))
- hashIntBase16, _ := new(big.Int).SetString(hash, 16)
+ hashIntBase16, _ := (&big.Int{}).SetString(hash, 16)
if checksum == nil {
checksum = hashIntBase16
diff --git a/internal/service/repository/fork_test.go b/internal/service/repository/fork_test.go
index d15a6f637..e04ef8c06 100644
--- a/internal/service/repository/fork_test.go
+++ b/internal/service/repository/fork_test.go
@@ -190,7 +190,7 @@ func injectCustomCATestCerts(t *testing.T) (*x509.CertPool, testhelper.Cleanup)
require.NoError(t, err)
defer certFile.Close()
- caPEMBytes := new(bytes.Buffer)
+ caPEMBytes := &bytes.Buffer{}
certPEMWriter := io.MultiWriter(certFile, caPEMBytes)
// create chained PEM file with CA and entity cert
diff --git a/internal/service/repository/gc_test.go b/internal/service/repository/gc_test.go
index e16b70e84..8b54cf8d3 100644
--- a/internal/service/repository/gc_test.go
+++ b/internal/service/repository/gc_test.go
@@ -130,7 +130,7 @@ func TestGarbageCollectLogStatistics(t *testing.T) {
logBuffer := &bytes.Buffer{}
testhelper.NewTestLogger = func(tb testhelper.TB) *logrus.Logger {
- return &logrus.Logger{Out: logBuffer, Formatter: new(logrus.JSONFormatter), Level: logrus.InfoLevel}
+ return &logrus.Logger{Out: logBuffer, Formatter: &logrus.JSONFormatter{}, Level: logrus.InfoLevel}
}
ctx, cancel := testhelper.Context()
diff --git a/internal/service/repository/repack_test.go b/internal/service/repository/repack_test.go
index 037db1f59..c35fe1769 100644
--- a/internal/service/repository/repack_test.go
+++ b/internal/service/repository/repack_test.go
@@ -56,7 +56,7 @@ func TestRepackIncrementalCollectLogStatistics(t *testing.T) {
logBuffer := &bytes.Buffer{}
testhelper.NewTestLogger = func(tb testhelper.TB) *logrus.Logger {
- return &logrus.Logger{Out: logBuffer, Formatter: new(logrus.JSONFormatter), Level: logrus.InfoLevel}
+ return &logrus.Logger{Out: logBuffer, Formatter: &logrus.JSONFormatter{}, Level: logrus.InfoLevel}
}
ctx, cancel := testhelper.Context()
@@ -205,7 +205,7 @@ func TestRepackFullCollectLogStatistics(t *testing.T) {
logBuffer := &bytes.Buffer{}
testhelper.NewTestLogger = func(tb testhelper.TB) *logrus.Logger {
- return &logrus.Logger{Out: logBuffer, Formatter: new(logrus.JSONFormatter), Level: logrus.InfoLevel}
+ return &logrus.Logger{Out: logBuffer, Formatter: &logrus.JSONFormatter{}, Level: logrus.InfoLevel}
}
ctx, cancel := testhelper.Context()
diff --git a/internal/stats/git_test.go b/internal/stats/git_test.go
index 0de62d3c6..0909b8400 100644
--- a/internal/stats/git_test.go
+++ b/internal/stats/git_test.go
@@ -28,7 +28,7 @@ func TestLogObjectInfo(t *testing.T) {
defer cancel()
logBuffer := &bytes.Buffer{}
- log := &logrus.Logger{Out: logBuffer, Formatter: new(logrus.JSONFormatter), Level: logrus.InfoLevel}
+ log := &logrus.Logger{Out: logBuffer, Formatter: &logrus.JSONFormatter{}, Level: logrus.InfoLevel}
testCtx := ctxlogrus.ToContext(ctx, log.WithField("test", "logging"))
requireLog := func(msg string) map[string]interface{} {
diff --git a/proto/go/internal/cmd/protoc-gen-gitaly/main.go b/proto/go/internal/cmd/protoc-gen-gitaly/main.go
index 08c691e2a..3968c3fc5 100644
--- a/proto/go/internal/cmd/protoc-gen-gitaly/main.go
+++ b/proto/go/internal/cmd/protoc-gen-gitaly/main.go
@@ -78,7 +78,7 @@ func main() {
log.Fatalf("reading input: %s", err)
}
- req := new(plugin.CodeGeneratorRequest)
+ req := &plugin.CodeGeneratorRequest{}
if err := proto.Unmarshal(data, req); err != nil {
log.Fatalf("parsing input proto: %s", err)
@@ -119,7 +119,7 @@ func lintProtos(req *plugin.CodeGeneratorRequest) error {
}
}
- resp := new(plugin.CodeGeneratorResponse)
+ resp := &plugin.CodeGeneratorResponse{}
if len(errMsgs) > 0 {
errMsg := strings.Join(errMsgs, "\n\t")
diff --git a/proto/go/internal/filedescriptor.go b/proto/go/internal/filedescriptor.go
index ef0214149..cf0a1862c 100644
--- a/proto/go/internal/filedescriptor.go
+++ b/proto/go/internal/filedescriptor.go
@@ -25,7 +25,7 @@ func ExtractFile(gz []byte) (*descriptor.FileDescriptorProto, error) {
return nil, fmt.Errorf("failed to uncompress descriptor: %v", err)
}
- fd := new(descriptor.FileDescriptorProto)
+ fd := &descriptor.FileDescriptorProto{}
if err := proto.Unmarshal(b, fd); err != nil {
return nil, fmt.Errorf("malformed FileDescriptorProto: %v", err)
}