Move inputoffset option to a hujson struct tag.

Otherwise staticcheck gets angry at us.
loreto · Sep 24, 2020 · dde312d · dde312d
1 parent b2e1dda
commit dde312d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/encode.go b/encode.go
@@ -1131,6 +1131,10 @@ func typeFields(t reflect.Type) structFields {
  if !isValidTag(name) {
  name = ""
  }
+
+ hutag := sf.Tag.Get("hujson")
+ _, huOpts := parseTag(hutag)
+
  index := make([]int, len(f.index)+1)
  copy(index, f.index)
  index[len(f.index)] = i
@@ -1154,7 +1158,7 @@ func typeFields(t reflect.Type) structFields {
  }
  }
 
- isInputOffset := opts.Contains("inputoffset") && ft.Kind() == reflect.Int64
+ isInputOffset := huOpts.Contains("inputoffset") && ft.Kind() == reflect.Int64
 
  // Record found field and index sequence.
  if name != "" || !sf.Anonymous || ft.Kind() != reflect.Struct || isInputOffset {

diff --git a/hujson_decode_test.go b/hujson_decode_test.go
@@ -50,7 +50,7 @@ func TestHuDecode(t *testing.T) {
 
 type ACL struct {
  Action string
- ByteOffset int64 `json:",inputoffset"`
+ ByteOffset int64 `hujson:",inputoffset"`
 }
 
 type ACLFile struct {