improve scoping for defers

myaaaaaaaaa · Sep 25, 2024 · 82ea788 · 82ea788
1 parent db8576e
commit 82ea788
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/prog.go b/prog.go
@@ -101,7 +101,7 @@ func (p *Program) Main() (rtErr error) {
 	f.populate(p.Args)
 
 	files := map[string]any{}
-	for _, filename := range f.filenames {
+	slices.Values(f.filenames)(func(filename string) bool {
 		file, err := p.Open(filename)
 		failif(err, "loading")
 		defer file.Close()
@@ -112,7 +112,9 @@ func (p *Program) Main() (rtErr error) {
 		} else {
 			files[filename] = v
 		}
-	}
+
+		return true
+	})
 
 	input := decoder(p.Stdin, "stdin", f.rawIn)
 	if p.StdinIsTerminal {

diff --git a/prog_test.go b/prog_test.go
@@ -79,10 +79,8 @@ func TestFS(t *testing.T) {
 		testRun(t, "", "error", &p)
 	}
 
-	p.Args = []string{"-r", ".[][] | .+.", "d.txt"}
-	testRun(t, "", "foofoo", &p)
-	p.Args = []string{"-r", ".[][] | .+.", "e.txt"}
-	testRun(t, "", "qq ww ee rr tt yy", &p)
+	p.Args = []string{"-r", ".[][] | .+.", "d.txt", "e.txt"}
+	testRun(t, "", "foofoo qq ww ee rr tt yy", &p)
 }
 func TestDry(t *testing.T) {
 	const q = `snapshot("\(.).json"; [.])`