Avoid shadowing variable (#263)

dsnet · web-flow · commit 290a6a23966f · 2021-05-27T10:48:29.000-07:00
Rename the shadowed variable i to j for better readability.
diff --git a/cmp/report_slices.go b/cmp/report_slices.go
@@ -563,10 +563,10 @@ func cleanupSurroundingIdentical(groups []diffStats, eq func(i, j int) bool) []d
 		nx := ds.NumIdentical + ds.NumRemoved + ds.NumModified
 		ny := ds.NumIdentical + ds.NumInserted + ds.NumModified
 		var numLeadingIdentical, numTrailingIdentical int
-		for i := 0; i < nx && i < ny && eq(ix+i, iy+i); i++ {
+		for j := 0; j < nx && j < ny && eq(ix+j, iy+j); j++ {
 			numLeadingIdentical++
 		}
-		for i := 0; i < nx && i < ny && eq(ix+nx-1-i, iy+ny-1-i); i++ {
+		for j := 0; j < nx && j < ny && eq(ix+nx-1-j, iy+ny-1-j); j++ {
 			numTrailingIdentical++
 		}
 		if numIdentical := numLeadingIdentical + numTrailingIdentical; numIdentical > 0 {

Original file line number	Diff line number	Diff line change
`@@ -563,10 +563,10 @@ func cleanupSurroundingIdentical(groups []diffStats, eq func(i, j int) bool) []d`
`563`	`563`	`nx := ds.NumIdentical + ds.NumRemoved + ds.NumModified`
`564`	`564`	`ny := ds.NumIdentical + ds.NumInserted + ds.NumModified`
`565`	`565`	`var numLeadingIdentical, numTrailingIdentical int`
`566`		`- for i := 0; i < nx && i < ny && eq(ix+i, iy+i); i++ {`
	`566`	`+ for j := 0; j < nx && j < ny && eq(ix+j, iy+j); j++ {`
`567`	`567`	`numLeadingIdentical++`
`568`	`568`	`}`
`569`		`- for i := 0; i < nx && i < ny && eq(ix+nx-1-i, iy+ny-1-i); i++ {`
	`569`	`+ for j := 0; j < nx && j < ny && eq(ix+nx-1-j, iy+ny-1-j); j++ {`
`570`	`570`	`numTrailingIdentical++`
`571`	`571`	`}`
`572`	`572`	`if numIdentical := numLeadingIdentical + numTrailingIdentical; numIdentical > 0 {`