From 6fc5d416a289235dd4bb56d29fb96c5a003ea89f Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sat, 11 Jun 2022 22:30:35 -0600
Subject: use %v when possible

Exceptions are
 - the occasional %x when the type is a basic int
 - %w
 - %q
 - %T
 - whenever print_tree.go needs to be dumb for compatibility with C
---
 pkg/util/bitfield.go | 2 +-
 pkg/util/fmt.go      | 4 ++--
 pkg/util/ref.go      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkg/util')

diff --git a/pkg/util/bitfield.go b/pkg/util/bitfield.go
index 216837d..23da17a 100644
--- a/pkg/util/bitfield.go
+++ b/pkg/util/bitfield.go
@@ -36,7 +36,7 @@ func BitfieldString[T ~uint8 | ~uint16 | ~uint32 | ~uint64](bitfield T, bitnames
 				if i < len(bitnames) {
 					out.WriteString(bitnames[i])
 				} else {
-					fmt.Fprintf(&out, "(1<<%d)", i)
+					fmt.Fprintf(&out, "(1<<%v)", i)
 				}
 				first = false
 			}
diff --git a/pkg/util/fmt.go b/pkg/util/fmt.go
index c0ff596..af7404c 100644
--- a/pkg/util/fmt.go
+++ b/pkg/util/fmt.go
@@ -16,13 +16,13 @@ func FmtStateString(st fmt.State, verb rune) string {
 		}
 	}
 	if width, ok := st.Width(); ok {
-		fmt.Fprintf(&ret, "%d", width)
+		fmt.Fprintf(&ret, "%v", width)
 	}
 	if prec, ok := st.Precision(); ok {
 		if prec == 0 {
 			ret.WriteByte('.')
 		} else {
-			fmt.Fprintf(&ret, ".%d", prec)
+			fmt.Fprintf(&ret, ".%v", prec)
 		}
 	}
 	ret.WriteRune(verb)
diff --git a/pkg/util/ref.go b/pkg/util/ref.go
index 57f2eac..aecfb9f 100644
--- a/pkg/util/ref.go
+++ b/pkg/util/ref.go
@@ -36,7 +36,7 @@ func (r *Ref[A, T]) Read() error {
 		return err
 	}
 	if n != size {
-		return fmt.Errorf("util.Ref[%T].Read: left over data: read %d bytes but only consumed %d",
+		return fmt.Errorf("util.Ref[%T].Read: left over data: read %v bytes but only consumed %v",
 			r.Data, size, n)
 	}
 	return nil
-- 
cgit v1.2.3-2-g168b