Skip to content

Commit

Permalink
Remove redundant variable dedeclarations
Browse files Browse the repository at this point in the history 
In go 1.22, loop variables are redeclared with each iteration of the
loop, rather than simple updated on each iteration. This means that we
no longer need to manually redeclare variables when they're closed over
by a function.
  • Loading branch information
@jesseduffield
jesseduffield committed May 19, 2024
1 parent 9124d8d commit fdff2de
Show file tree
Hide file tree
Showing 38 changed files with 3 additions and 84 deletions.
5 changes: 0 additions & 5 deletions pkg/commands/git_commands/branch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ func TestBranchGetCommitDifferences(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildBranchCommands(commonDeps{runner: s.runner})
pushables, pullables := instance.GetCommitDifferences("HEAD", "@{u}")
Expand Down Expand Up @@ -89,7 +88,6 @@ func TestBranchDeleteBranch(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildBranchCommands(commonDeps{runner: s.runner})

Expand Down Expand Up @@ -150,7 +148,6 @@ func TestBranchMerge(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
runner := oscommands.NewFakeRunner(t).
ExpectGitArgs(s.expected, "", nil)
Expand Down Expand Up @@ -190,7 +187,6 @@ func TestBranchCheckout(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildBranchCommands(commonDeps{runner: s.runner})
s.test(instance.Checkout("test", CheckoutOptions{Force: s.force}))
Expand Down Expand Up @@ -279,7 +275,6 @@ func TestBranchCurrentBranchInfo(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildBranchCommands(commonDeps{runner: s.runner})
s.test(instance.CurrentBranchInfo())
Expand Down
2 changes: 0 additions & 2 deletions pkg/commands/git_commands/commit_loader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,8 +505,6 @@ func (self *CommitLoader) getExistingMainBranches() []string {

for i, branchName := range mainBranches {
wg.Add(1)
i := i
branchName := branchName
go utils.Safe(func() {
defer wg.Done()

Expand Down
1 change: 0 additions & 1 deletion pkg/commands/git_commands/commit_loader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ func TestGetCommits(t *testing.T) {
}

for _, scenario := range scenarios {
scenario := scenario
t.Run(scenario.testName, func(t *testing.T) {
common := utils.NewDummyCommon()
common.AppState = &config.AppState{}
Expand Down
8 changes: 0 additions & 8 deletions pkg/commands/git_commands/commit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ func TestCommitRewordCommit(t *testing.T) {
},
}
for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildCommitCommands(commonDeps{runner: s.runner})

Expand Down Expand Up @@ -100,7 +99,6 @@ func TestCommitCommitCmdObj(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
userConfig := config.GetDefaultConfig()
userConfig.Git.Commit.SignOff = s.configSignoff
Expand Down Expand Up @@ -136,7 +134,6 @@ func TestCommitCommitEditorCmdObj(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
userConfig := config.GetDefaultConfig()
userConfig.Git.Commit.SignOff = s.configSignoff
Expand Down Expand Up @@ -171,7 +168,6 @@ func TestCommitCreateFixupCommit(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildCommitCommands(commonDeps{runner: s.runner})
s.test(instance.CreateFixupCommit(s.hash))
Expand Down Expand Up @@ -221,7 +217,6 @@ func TestCommitCreateAmendCommit(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildCommitCommands(commonDeps{runner: s.runner})
err := instance.CreateAmendCommit(s.originalSubject, s.newSubject, s.newDescription, s.includeFileChanges)
Expand Down Expand Up @@ -285,7 +280,6 @@ func TestCommitShowCmdObj(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
userConfig := config.GetDefaultConfig()
userConfig.Git.Paging.ExternalDiffCommand = s.extDiffCmd
Expand Down Expand Up @@ -334,7 +328,6 @@ func TestGetCommitMsg(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildCommitCommands(commonDeps{
runner: oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"-c", "log.showsignature=false", "log", "--format=%B", "--max-count=1", "deadbeef"}, s.input, nil),
Expand Down Expand Up @@ -374,7 +367,6 @@ func TestGetCommitMessageFromHistory(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildCommitCommands(commonDeps{runner: s.runner})

Expand Down
1 change: 0 additions & 1 deletion pkg/commands/git_commands/file_loader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ func TestFileGetStatusFiles(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
cmd := oscommands.NewDummyCmdObjBuilder(s.runner)

Expand Down
2 changes: 0 additions & 2 deletions pkg/commands/git_commands/flow_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ func TestStartCmdObj(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildFlowCommands(commonDeps{})

Expand Down Expand Up @@ -69,7 +68,6 @@ func TestFinishCmdObj(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildFlowCommands(commonDeps{
gitConfig: git_config.NewFakeGitConfig(s.gitConfigMockResponses),
Expand Down
3 changes: 0 additions & 3 deletions pkg/commands/git_commands/rebase_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func TestRebaseRebaseBranch(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildRebaseCommands(commonDeps{runner: s.runner, gitVersion: s.gitVersion})
s.test(instance.RebaseBranch(s.arg))
Expand All @@ -89,7 +88,6 @@ func TestRebaseSkipEditorCommand(t *testing.T) {
`^GIT_SEQUENCE_EDITOR=.*$`,
"^" + daemon.DaemonKindEnvKey + "=" + strconv.Itoa(int(daemon.DaemonKindExitImmediately)) + "$",
} {
regexStr := regexStr
foundMatch := lo.ContainsBy(envVars, func(envVar string) bool {
return regexp.MustCompile(regexStr).MatchString(envVar)
})
Expand Down Expand Up @@ -163,7 +161,6 @@ func TestRebaseDiscardOldFileChanges(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildRebaseCommands(commonDeps{
runner: s.runner,
Expand Down
1 change: 0 additions & 1 deletion pkg/commands/git_commands/reflog_commit_loader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ func TestGetReflogCommits(t *testing.T) {
}

for _, scenario := range scenarios {
scenario := scenario
t.Run(scenario.testName, func(t *testing.T) {
builder := &ReflogCommitLoader{
Common: utils.NewDummyCommon(),
Expand Down
1 change: 0 additions & 1 deletion pkg/commands/git_commands/repo_paths_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ func TestGetRepoPaths(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.Name, func(t *testing.T) {
runner := oscommands.NewFakeRunner(t)
cmd := oscommands.NewDummyCmdObjBuilder(runner)
Expand Down
1 change: 0 additions & 1 deletion pkg/commands/git_commands/stash_loader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ func TestGetStashEntries(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
cmd := oscommands.NewDummyCmdObjBuilder(s.runner)

Expand Down
3 changes: 0 additions & 3 deletions pkg/commands/git_commands/stash_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ func TestStashStore(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
runner := oscommands.NewFakeRunner(t).
ExpectGitArgs(s.expected, "", nil)
Expand Down Expand Up @@ -131,7 +130,6 @@ func TestStashStashEntryCmdObj(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
userConfig := config.GetDefaultConfig()
appState := &config.AppState{}
Expand Down Expand Up @@ -181,7 +179,6 @@ func TestStashRename(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
runner := oscommands.NewFakeRunner(t).
ExpectGitArgs(s.expectedHashCmd, s.hashResult, nil).
Expand Down
3 changes: 0 additions & 3 deletions pkg/commands/git_commands/sync_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ func TestSyncPush(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildSyncCommands(commonDeps{})
task := gocui.NewFakeTask()
Expand Down Expand Up @@ -124,7 +123,6 @@ func TestSyncFetch(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildSyncCommands(commonDeps{})
instance.UserConfig.Git.FetchAll = s.fetchAllConfig
Expand Down Expand Up @@ -163,7 +161,6 @@ func TestSyncFetchBackground(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildSyncCommands(commonDeps{})
instance.UserConfig.Git.FetchAll = s.fetchAllConfig
Expand Down
1 change: 0 additions & 1 deletion pkg/commands/git_commands/tag_loader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ func TestGetTags(t *testing.T) {
}

for _, scenario := range scenarios {
scenario := scenario
t.Run(scenario.testName, func(t *testing.T) {
loader := &TagLoader{
Common: utils.NewDummyCommon(),
Expand Down
9 changes: 0 additions & 9 deletions pkg/commands/git_commands/working_tree_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ func TestWorkingTreeUnstageFile(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})
s.test(instance.UnStageFile([]string{"test.txt"}, s.reset))
Expand Down Expand Up @@ -190,7 +189,6 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildWorkingTreeCommands(commonDeps{runner: s.runner, removeFile: s.removeFile})
err := instance.DiscardAllFileChanges(s.file)
Expand Down Expand Up @@ -306,7 +304,6 @@ func TestWorkingTreeDiff(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
userConfig := config.GetDefaultConfig()
appState := &config.AppState{}
Expand Down Expand Up @@ -375,7 +372,6 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
userConfig := config.GetDefaultConfig()
appState := &config.AppState{}
Expand Down Expand Up @@ -428,7 +424,6 @@ func TestWorkingTreeCheckoutFile(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})

Expand Down Expand Up @@ -459,7 +454,6 @@ func TestWorkingTreeDiscardUnstagedFileChanges(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})
s.test(instance.DiscardUnstagedFileChanges(s.file))
Expand Down Expand Up @@ -487,7 +481,6 @@ func TestWorkingTreeDiscardAnyUnstagedFileChanges(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})
s.test(instance.DiscardAnyUnstagedFileChanges())
Expand Down Expand Up @@ -515,7 +508,6 @@ func TestWorkingTreeRemoveUntrackedFiles(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})
s.test(instance.RemoveUntrackedFiles())
Expand Down Expand Up @@ -545,7 +537,6 @@ func TestWorkingTreeResetHard(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})
s.test(instance.ResetHard(s.ref))
Expand Down
2 changes: 0 additions & 2 deletions pkg/commands/git_commands/worktree_loader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
wg := sync.WaitGroup{}
wg.Add(len(worktrees))
for _, worktree := range worktrees {
worktree := worktree

go utils.Safe(func() {
defer wg.Done()

Expand Down
1 change: 0 additions & 1 deletion pkg/commands/git_commands/worktree_loader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ branch refs/heads/mybranch-worktree
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
runner := oscommands.NewFakeRunner(t)
fs := afero.NewMemMapFs()
Expand Down
2 changes: 0 additions & 2 deletions pkg/commands/git_config/cached_git_config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ func TestGetBool(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
fake := NewFakeGitConfig(s.mockResponses)
real := NewCachedGitConfig(
Expand Down Expand Up @@ -87,7 +86,6 @@ func TestGet(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
fake := NewFakeGitConfig(s.mockResponses)
real := NewCachedGitConfig(
Expand Down
1 change: 0 additions & 1 deletion pkg/commands/hosting_service/hosting_service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,6 @@ func TestGetPullRequestURL(t *testing.T) {
}

for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
tr := i18n.EnglishTranslationSet()
log := &fakes.FakeFieldLogger{}
Expand Down
7 changes: 3 additions & 4 deletions pkg/commands/oscommands/os.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,14 +239,13 @@ func (c *OSCommand) PipeCommands(cmdObjs ...ICmdObj) error {
wg.Add(len(cmds))

for _, cmd := range cmds {
currentCmd := cmd
go utils.Safe(func() {
stderr, err := currentCmd.StderrPipe()
stderr, err := cmd.StderrPipe()
if err != nil {
c.Log.Error(err)
}

if err := currentCmd.Start(); err != nil {
if err := cmd.Start(); err != nil {
c.Log.Error(err)
}

Expand All @@ -256,7 +255,7 @@ func (c *OSCommand) PipeCommands(cmdObjs ...ICmdObj) error {
}
}

if err := currentCmd.Wait(); err != nil {
if err := cmd.Wait(); err != nil {
c.Log.Error(err)
}

Expand Down
Loading

0 comments on commit fdff2de

Please sign in to comment.