From f4f062d7d4ed730411e04ecd36ee36387e50739c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Thu, 26 Jan 2023 01:08:22 -0700
Subject: Upgrade to lowmemjson v0.2.0

---
 cmd/btrfs-rec/util.go          |  4 ++--
 go.mod                         |  2 +-
 go.sum                         |  4 ++--
 lib/btrfs/btrfssum/shortsum.go | 10 +++++-----
 lib/containers/set.go          |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cmd/btrfs-rec/util.go b/cmd/btrfs-rec/util.go
index b2497b2..3c72cae 100644
--- a/cmd/btrfs-rec/util.go
+++ b/cmd/btrfs-rec/util.go
@@ -31,7 +31,7 @@ func readJSONFile[T any](ctx context.Context, filename string) (T, error) {
 		return zero, err
 	}
 	var ret T
-	if err := lowmemjson.DecodeThenEOF(buf, &ret); err != nil {
+	if err := lowmemjson.NewDecoder(buf).DecodeThenEOF(&ret); err != nil {
 		var zero T
 		return zero, err
 	}
@@ -46,5 +46,5 @@ func writeJSONFile(w io.Writer, obj any, cfg lowmemjson.ReEncoder) (err error) {
 		}
 	}()
 	cfg.Out = buffer
-	return lowmemjson.Encode(&cfg, obj)
+	return lowmemjson.NewEncoder(&cfg).Encode(obj)
 }
diff --git a/go.mod b/go.mod
index 0d06d37..bd3f702 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.1.0
+	git.lukeshu.com/go/lowmemjson v0.2.0
 	github.com/datawire/dlib v1.3.0
 	github.com/datawire/ocibuild v0.0.3-0.20220423003204-fc6a4e9f90dc
 	github.com/davecgh/go-spew v1.1.1
diff --git a/go.sum b/go.sum
index 62c6e41..c6e06c5 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-git.lukeshu.com/go/lowmemjson v0.1.0 h1:goVddyNYqpcotUNenrzz7sVjrtCf942h8qzGoqNuxMg=
-git.lukeshu.com/go/lowmemjson v0.1.0/go.mod h1:7StdaFpmZNKYJmQ67fGbzcIcnrGjmD54f/2WbeHLaBw=
+git.lukeshu.com/go/lowmemjson v0.2.0 h1:ybTArT2jmTJ1QVFGycnGX20zFDKBaqQp4S+dI3vOkTI=
+git.lukeshu.com/go/lowmemjson v0.2.0/go.mod h1:7StdaFpmZNKYJmQ67fGbzcIcnrGjmD54f/2WbeHLaBw=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/datawire/dlib v1.3.0 h1:KkmyXU1kwm3oPBk1ypR70YbcOlEXWzEbx5RE0iRXTGk=
 github.com/datawire/dlib v1.3.0/go.mod h1:NiGDmetmbkBvtznpWSx6C0vA0s0LK9aHna3LJDqjruk=
diff --git a/lib/btrfs/btrfssum/shortsum.go b/lib/btrfs/btrfssum/shortsum.go
index c3d6f8b..e3441ae 100644
--- a/lib/btrfs/btrfssum/shortsum.go
+++ b/lib/btrfs/btrfssum/shortsum.go
@@ -248,7 +248,7 @@ func (sg SumRunWithGaps[Addr]) EncodeJSON(w io.Writer) error {
 			}
 			fallthrough
 		default:
-			if err := lowmemjson.Encode(w, run); err != nil {
+			if err := lowmemjson.NewEncoder(w).Encode(run); err != nil {
 				return err
 			}
 			cur = run.Addr.Add(run.Size())
@@ -274,18 +274,18 @@ func (sg *SumRunWithGaps[Addr]) DecodeJSON(r io.RuneScanner) error {
 	var name string
 	return lowmemjson.DecodeObject(r,
 		func(r io.RuneScanner) error {
-			return lowmemjson.Decode(r, &name)
+			return lowmemjson.NewDecoder(r).Decode(&name)
 		},
 		func(r io.RuneScanner) error {
 			switch name {
 			case "Addr":
-				return lowmemjson.Decode(r, &sg.Addr)
+				return lowmemjson.NewDecoder(r).Decode(&sg.Addr)
 			case "Size":
-				return lowmemjson.Decode(r, &sg.Size)
+				return lowmemjson.NewDecoder(r).Decode(&sg.Size)
 			case "Runs":
 				return lowmemjson.DecodeArray(r, func(r io.RuneScanner) error {
 					var run SumRun[Addr]
-					if err := lowmemjson.Decode(r, &run); err != nil {
+					if err := lowmemjson.NewDecoder(r).Decode(&run); err != nil {
 						return err
 					}
 					if run.ChecksumSize > 0 {
diff --git a/lib/containers/set.go b/lib/containers/set.go
index 4fc8aad..b2af494 100644
--- a/lib/containers/set.go
+++ b/lib/containers/set.go
@@ -71,7 +71,7 @@ func (o Set[T]) EncodeJSON(w io.Writer) error {
 		return less(keys[i], keys[j])
 	})
 
-	return lowmemjson.Encode(w, keys)
+	return lowmemjson.NewEncoder(w).Encode(keys)
 }
 
 func (o *Set[T]) DecodeJSON(r io.RuneScanner) error {
@@ -87,7 +87,7 @@ func (o *Set[T]) DecodeJSON(r io.RuneScanner) error {
 	*o = Set[T]{}
 	return lowmemjson.DecodeArray(r, func(r io.RuneScanner) error {
 		var val T
-		if err := lowmemjson.Decode(r, &val); err != nil {
+		if err := lowmemjson.NewDecoder(r).Decode(&val); err != nil {
 			return err
 		}
 		(*o)[val] = struct{}{}
-- 
cgit v1.2.3-2-g168b