diff options
| author | Joe Tsai <joetsai@digital-static.net> | 2025-07-14 14:41:16 -0700 |
|---|---|---|
| committer | Joe Tsai <joetsai@digital-static.net> | 2025-07-14 14:45:45 -0700 |
| commit | 6248c1ceca7aa6ed669dac1c6e320a3c21610389 (patch) | |
| tree | 45b53344b6c88d618310afee4cc85d73f5dde01d /types | |
| parent | fc5050048ee9c71dcdeb232d3a38f068072f489f (diff) | |
| download | tailscale-dsnet/jsonv1in2.tar.xz tailscale-dsnet/jsonv1in2.zip | |
all: use "github.com/go-json-experiment/json/v1" over "encoding/json"dsnet/jsonv1in2
DO NOT SUBMIT: experiment to check how much breaks.
Signed-off-by: Joe Tsai <joetsai@digital-static.net>
Diffstat (limited to 'types')
| -rw-r--r-- | types/appctype/appconnector_test.go | 2 | ||||
| -rw-r--r-- | types/dnstype/dnstype_view.go | 2 | ||||
| -rw-r--r-- | types/ipproto/ipproto_test.go | 2 | ||||
| -rw-r--r-- | types/key/control.go | 2 | ||||
| -rw-r--r-- | types/key/control_test.go | 2 | ||||
| -rw-r--r-- | types/key/derp.go | 2 | ||||
| -rw-r--r-- | types/key/disco_test.go | 2 | ||||
| -rw-r--r-- | types/key/machine_test.go | 2 | ||||
| -rw-r--r-- | types/key/node_test.go | 2 | ||||
| -rw-r--r-- | types/logger/logger.go | 2 | ||||
| -rw-r--r-- | types/netlogtype/netlogtype_test.go | 2 | ||||
| -rw-r--r-- | types/netmap/netmap.go | 2 | ||||
| -rw-r--r-- | types/opt/bool_test.go | 2 | ||||
| -rw-r--r-- | types/opt/value_test.go | 4 | ||||
| -rw-r--r-- | types/persist/persist_view.go | 2 | ||||
| -rw-r--r-- | types/prefs/prefs_example/prefs_example_view.go | 2 | ||||
| -rw-r--r-- | types/prefs/prefs_test.go | 2 | ||||
| -rw-r--r-- | types/prefs/prefs_view_test.go | 2 | ||||
| -rw-r--r-- | types/tkatype/tkatype_test.go | 2 | ||||
| -rw-r--r-- | types/views/views.go | 2 | ||||
| -rw-r--r-- | types/views/views_test.go | 2 |
21 files changed, 22 insertions, 22 deletions
diff --git a/types/appctype/appconnector_test.go b/types/appctype/appconnector_test.go index 390d1776a..2d8fbc42a 100644 --- a/types/appctype/appconnector_test.go +++ b/types/appctype/appconnector_test.go @@ -4,7 +4,7 @@ package appctype import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "net/netip" "strings" "testing" diff --git a/types/dnstype/dnstype_view.go b/types/dnstype/dnstype_view.go index c77ff9a40..c15b1588d 100644 --- a/types/dnstype/dnstype_view.go +++ b/types/dnstype/dnstype_view.go @@ -6,7 +6,7 @@ package dnstype import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "net/netip" diff --git a/types/ipproto/ipproto_test.go b/types/ipproto/ipproto_test.go index 102b79cff..c2dce3921 100644 --- a/types/ipproto/ipproto_test.go +++ b/types/ipproto/ipproto_test.go @@ -5,7 +5,7 @@ package ipproto import ( "encoding" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "testing" diff --git a/types/key/control.go b/types/key/control.go index 96021249b..970d91abb 100644 --- a/types/key/control.go +++ b/types/key/control.go @@ -3,7 +3,7 @@ package key -import "encoding/json" +import "github.com/go-json-experiment/json/v1" // ControlPrivate is a Tailscale control plane private key. // diff --git a/types/key/control_test.go b/types/key/control_test.go index a98a586f3..a40dfc37a 100644 --- a/types/key/control_test.go +++ b/types/key/control_test.go @@ -4,7 +4,7 @@ package key import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "testing" ) diff --git a/types/key/derp.go b/types/key/derp.go index 1466b85bc..2c5d10100 100644 --- a/types/key/derp.go +++ b/types/key/derp.go @@ -6,7 +6,7 @@ package key import ( "crypto/subtle" "encoding/hex" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "strings" diff --git a/types/key/disco_test.go b/types/key/disco_test.go index c62c13cbf..be7b64d0e 100644 --- a/types/key/disco_test.go +++ b/types/key/disco_test.go @@ -5,7 +5,7 @@ package key import ( "bytes" - "encoding/json" + "github.com/go-json-experiment/json/v1" "testing" ) diff --git a/types/key/machine_test.go b/types/key/machine_test.go index 157df9e43..90dafef75 100644 --- a/types/key/machine_test.go +++ b/types/key/machine_test.go @@ -5,7 +5,7 @@ package key import ( "bytes" - "encoding/json" + "github.com/go-json-experiment/json/v1" "strings" "testing" ) diff --git a/types/key/node_test.go b/types/key/node_test.go index 80a2dadf9..8ecd3afb5 100644 --- a/types/key/node_test.go +++ b/types/key/node_test.go @@ -6,7 +6,7 @@ package key import ( "bufio" "bytes" - "encoding/json" + "github.com/go-json-experiment/json/v1" "strings" "testing" ) diff --git a/types/logger/logger.go b/types/logger/logger.go index 6c4edf633..9c4678c51 100644 --- a/types/logger/logger.go +++ b/types/logger/logger.go @@ -10,7 +10,7 @@ import ( "bufio" "bytes" "container/list" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "io" "log" diff --git a/types/netlogtype/netlogtype_test.go b/types/netlogtype/netlogtype_test.go index 7f29090c5..bfe437f66 100644 --- a/types/netlogtype/netlogtype_test.go +++ b/types/netlogtype/netlogtype_test.go @@ -4,7 +4,7 @@ package netlogtype import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "math" "net/netip" "testing" diff --git a/types/netmap/netmap.go b/types/netmap/netmap.go index 963f80a44..0ed50724f 100644 --- a/types/netmap/netmap.go +++ b/types/netmap/netmap.go @@ -6,7 +6,7 @@ package netmap import ( "cmp" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "net/netip" "sort" diff --git a/types/opt/bool_test.go b/types/opt/bool_test.go index dddbcfc19..812c5ca9b 100644 --- a/types/opt/bool_test.go +++ b/types/opt/bool_test.go @@ -4,7 +4,7 @@ package opt import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "flag" "reflect" "strings" diff --git a/types/opt/value_test.go b/types/opt/value_test.go index 890f9a579..f93f78a72 100644 --- a/types/opt/value_test.go +++ b/types/opt/value_test.go @@ -4,7 +4,7 @@ package opt import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "reflect" "testing" @@ -95,7 +95,7 @@ func TestValue(t *testing.T) { ExplicitUnset: Value[bool]{}, }, want: bools.IfElse( - // Detect whether v1 "encoding/json" supports `omitzero` or not. + // Detect whether v1 "github.com/go-json-experiment/json/v1" supports `omitzero` or not. // TODO(Go1.24): Remove this after `omitzero` is supported. string(must.Get(json.Marshal(struct { X int `json:",omitzero"` diff --git a/types/persist/persist_view.go b/types/persist/persist_view.go index 55eb40c51..8e90efe62 100644 --- a/types/persist/persist_view.go +++ b/types/persist/persist_view.go @@ -6,7 +6,7 @@ package persist import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "tailscale.com/tailcfg" diff --git a/types/prefs/prefs_example/prefs_example_view.go b/types/prefs/prefs_example/prefs_example_view.go index 9aaac6e9c..2bf5f32a9 100644 --- a/types/prefs/prefs_example/prefs_example_view.go +++ b/types/prefs/prefs_example/prefs_example_view.go @@ -6,7 +6,7 @@ package prefs_example import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "net/netip" diff --git a/types/prefs/prefs_test.go b/types/prefs/prefs_test.go index d6af745bf..a762b22eb 100644 --- a/types/prefs/prefs_test.go +++ b/types/prefs/prefs_test.go @@ -5,7 +5,7 @@ package prefs import ( "bytes" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "net/netip" "reflect" diff --git a/types/prefs/prefs_view_test.go b/types/prefs/prefs_view_test.go index f6cfc918d..b94c7f665 100644 --- a/types/prefs/prefs_view_test.go +++ b/types/prefs/prefs_view_test.go @@ -6,7 +6,7 @@ package prefs import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "net/netip" ) diff --git a/types/tkatype/tkatype_test.go b/types/tkatype/tkatype_test.go index c81891b9c..90ba0b254 100644 --- a/types/tkatype/tkatype_test.go +++ b/types/tkatype/tkatype_test.go @@ -4,7 +4,7 @@ package tkatype import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "testing" "golang.org/x/crypto/blake2s" diff --git a/types/views/views.go b/types/views/views.go index 3911f1112..11ffcd729 100644 --- a/types/views/views.go +++ b/types/views/views.go @@ -7,7 +7,7 @@ package views import ( "bytes" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "iter" diff --git a/types/views/views_test.go b/types/views/views_test.go index 2205cbc03..0b61f011c 100644 --- a/types/views/views_test.go +++ b/types/views/views_test.go @@ -5,7 +5,7 @@ package views import ( "bytes" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "net/netip" "reflect" |
