Skip to content

Commit

Permalink
start using range-over-func
Browse files Browse the repository at this point in the history
It so happens that Environ.Each already conforms to iter.Seq2.
  • Loading branch information
mvdan committed Feb 11, 2025
1 parent c9f18cd commit df624fe
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
5 changes: 2 additions & 3 deletions expand/param.go
Original file line number Diff line number Diff line change
Expand Up @@ -415,11 +415,10 @@ func (cfg *Config) varInd(vr Variable, idx syntax.ArithmExpr) (string, error) {

func (cfg *Config) namesByPrefix(prefix string) []string {
var names []string
cfg.Env.Each(func(name string, vr Variable) bool {
for name := range cfg.Env.Each {
if strings.HasPrefix(name, prefix) {
names = append(names, name)
}
return true
})
}
return names
}
5 changes: 1 addition & 4 deletions interp/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -810,10 +810,7 @@ func (r *Runner) Run(ctx context.Context, node syntax.Node) error {
r.setErr(NewExitStatus(uint8(r.exit)))
}
if r.Vars != nil {
r.writeEnv.Each(func(name string, vr expand.Variable) bool {
r.Vars[name] = vr
return true
})
maps.Insert(r.Vars, r.writeEnv.Each)
}
return r.err
}
Expand Down
5 changes: 2 additions & 3 deletions interp/vars.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (o *overlayEnviron) Each(f func(name string, vr expand.Variable) bool) {

func execEnv(env expand.Environ) []string {
list := make([]string, 0, 64)
env.Each(func(name string, vr expand.Variable) bool {
for name, vr := range env.Each {
if !vr.IsSet() {
// If a variable is set globally but unset in the
// runner, we need to ensure it's not part of the final
Expand All @@ -92,8 +92,7 @@ func execEnv(env expand.Environ) []string {
if vr.Exported && vr.Kind == expand.String {
list = append(list, name+"="+vr.String())
}
return true
})
}
return list
}

Expand Down

0 comments on commit df624fe

Please sign in to comment.