Merge pull request #299 from ackama:linting/enable-predeclared

PiperOrigin-RevId: 698317433
google · Nov 20, 2024 · 7ef3529 · 7ef3529
2 parents 178fdef + e0768be
commit 7ef3529
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -65,7 +65,7 @@ linters:
 #    - paralleltest
 #    - perfsprint
 #    - prealloc
-#    - predeclared
+    - predeclared
     - promlinter
 #    - protogetter
     - reassign

diff --git a/detector/detector_test.go b/detector/detector_test.go
@@ -169,7 +169,7 @@ func TestRun(t *testing.T) {
 }
 
 func withDetectorName(f *detector.Finding, det string) *detector.Finding {
-	copy := *f
-	copy.Detectors = []string{det}
-	return &copy
+	c := *f
+	c.Detectors = []string{det}
+	return &c
 }
diff --git a/scalibr_test.go b/scalibr_test.go
@@ -185,9 +185,9 @@ func TestScan(t *testing.T) {
 }
 
 func withDetectorName(f *detector.Finding, det string) *detector.Finding {
-	copy := *f
-	copy.Detectors = []string{det}
-	return &copy
+	c := *f
+	c.Detectors = []string{det}
+	return &c
 }
 
 func TestEnableRequiredExtractors(t *testing.T) {

diff --git a/testing/fakedetector/fake_detector.go b/testing/fakedetector/fake_detector.go
@@ -38,15 +38,15 @@ type fakeDetector struct {
 //
 // The detector returns the specified Finding or error.
 func New(name string, version int, finding *detector.Finding, err error) detector.Detector {
-	var copy *detector.Finding
+	var c *detector.Finding
 	if finding != nil {
-		copy = &detector.Finding{}
-		*copy = *finding
+		c = &detector.Finding{}
+		*c = *finding
 	}
 	return &fakeDetector{
 		DetName:    name,
 		DetVersion: version,
-		Finding:    copy,
+		Finding:    c,
 		Err:        err,
 	}
 }