Upgrade to lowmemjson v0.3.0

6 files changed, 8 insertions, 9 deletions

diff --git a/cmd/btrfs-rec/inspect_rebuildmappings.go b/cmd/btrfs-rec/inspect_rebuildmappings.go
index e1f273c..51f0327 100644
--- a/cmd/btrfs-rec/inspect_rebuildmappings.go
+++ b/cmd/btrfs-rec/inspect_rebuildmappings.go
@@ -47,7 +47,7 @@ func init() {
 			}
 
 			dlog.Infof(ctx, "Writing reconstructed mappings to stdout...")
-			if err := writeJSONFile(os.Stdout, fs.LV.Mappings(), lowmemjson.ReEncoder{
+			if err := writeJSONFile(os.Stdout, fs.LV.Mappings(), lowmemjson.ReEncoderConfig{
 				Indent:                "\t",
 				ForceTrailingNewlines: true,
 				CompactIfUnder:        120, //nolint:gomnd // This is what looks nice.
diff --git a/cmd/btrfs-rec/inspect_rebuildnodes.go b/cmd/btrfs-rec/inspect_rebuildnodes.go
index d813f36..e8f9ada 100644
--- a/cmd/btrfs-rec/inspect_rebuildnodes.go
+++ b/cmd/btrfs-rec/inspect_rebuildnodes.go
@@ -57,7 +57,7 @@ func init() {
 				dlog.Errorf(ctx, "rebuild error: %v", rebuildErr)
 			}
 			dlog.Infof(ctx, "Writing re-built nodes to %s...", dst.Name())
-			if err := writeJSONFile(dst, rebuilder.ListRoots(), lowmemjson.ReEncoder{
+			if err := writeJSONFile(dst, rebuilder.ListRoots(), lowmemjson.ReEncoderConfig{
 				Indent:                "\t",
 				ForceTrailingNewlines: true,
 			}); err != nil {
diff --git a/cmd/btrfs-rec/inspect_scandevices.go b/cmd/btrfs-rec/inspect_scandevices.go
index ade9d74..3de35d0 100644
--- a/cmd/btrfs-rec/inspect_scandevices.go
+++ b/cmd/btrfs-rec/inspect_scandevices.go
@@ -31,7 +31,7 @@ func init() {
 			}
 
 			dlog.Info(ctx, "Writing scan results to stdout...")
-			if err := writeJSONFile(os.Stdout, results, lowmemjson.ReEncoder{
+			if err := writeJSONFile(os.Stdout, results, lowmemjson.ReEncoderConfig{
 				Indent:                "\t",
 				ForceTrailingNewlines: true,
 				CompactIfUnder:        16, //nolint:gomnd // This is what looks nice.
diff --git a/cmd/btrfs-rec/util.go b/cmd/btrfs-rec/util.go
index 3c72cae..3d751a6 100644
--- a/cmd/btrfs-rec/util.go
+++ b/cmd/btrfs-rec/util.go
@@ -38,13 +38,12 @@ func readJSONFile[T any](ctx context.Context, filename string) (T, error) {
 	return ret, nil
 }
 
-func writeJSONFile(w io.Writer, obj any, cfg lowmemjson.ReEncoder) (err error) {
+func writeJSONFile(w io.Writer, obj any, cfg lowmemjson.ReEncoderConfig) (err error) {
 	buffer := bufio.NewWriter(w)
 	defer func() {
 		if _err := buffer.Flush(); err == nil && _err != nil {
 			err = _err
 		}
 	}()
-	cfg.Out = buffer
-	return lowmemjson.NewEncoder(&cfg).Encode(obj)
+	return lowmemjson.NewEncoder(lowmemjson.NewReEncoder(buffer, cfg)).Encode(obj)
 }
diff --git a/go.mod b/go.mod
index d14ff26..52aa205 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ module git.lukeshu.com/btrfs-progs-ng
 go 1.19
 
 require (
-	git.lukeshu.com/go/lowmemjson v0.2.0
+	git.lukeshu.com/go/lowmemjson v0.3.0
 	git.lukeshu.com/go/typedsync v0.0.0-20230126205501-1e8afc0ceb1e
 	github.com/datawire/dlib v1.3.0
 	github.com/datawire/ocibuild v0.0.3-0.20220423003204-fc6a4e9f90dc
diff --git a/go.sum b/go.sum
index ee0b036..9df9c6b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-git.lukeshu.com/go/lowmemjson v0.2.0 h1:ybTArT2jmTJ1QVFGycnGX20zFDKBaqQp4S+dI3vOkTI=
-git.lukeshu.com/go/lowmemjson v0.2.0/go.mod h1:7StdaFpmZNKYJmQ67fGbzcIcnrGjmD54f/2WbeHLaBw=
+git.lukeshu.com/go/lowmemjson v0.3.0 h1:JBoTVAYij6pSMWnUSwxpv+e+3Fz8VRgZVNuYvY+0pvc=
+git.lukeshu.com/go/lowmemjson v0.3.0/go.mod h1:7StdaFpmZNKYJmQ67fGbzcIcnrGjmD54f/2WbeHLaBw=
 git.lukeshu.com/go/typedsync v0.0.0-20230126205501-1e8afc0ceb1e h1:ZAzzElMx7aMgJXC9QXOxIPyoZrWxX00eP2sR4UHYP+4=
 git.lukeshu.com/go/typedsync v0.0.0-20230126205501-1e8afc0ceb1e/go.mod h1:EAn7NcfoGeGMv3DWxKQnifcT/rYPAIEqp9Rsz//oYqY=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=