From 455b3f8bb8ab24ea6a33185a3b4529887986a46b Mon Sep 17 00:00:00 2001 From: Tao Wen Date: Wed, 28 Feb 2018 17:09:30 +0800 Subject: [PATCH] move reflect2 from plz to modern-go --- Gopkg.lock | 40 +++++++------------------------ Gopkg.toml | 17 +++---------- any.go | 2 +- config.go | 2 +- extension_tests/extension_test.go | 2 +- extra/binary_as_string_codec.go | 2 +- extra/fuzzy_decoder.go | 2 +- reflect.go | 2 +- reflect_array.go | 2 +- reflect_dynamic.go | 2 +- reflect_extension.go | 2 +- reflect_json_number.go | 2 +- reflect_json_raw_message.go | 2 +- reflect_map.go | 2 +- reflect_marshaler.go | 2 +- reflect_native.go | 2 +- reflect_optional.go | 2 +- reflect_slice.go | 2 +- reflect_struct_decoder.go | 2 +- reflect_struct_encoder.go | 2 +- value_tests/value_test.go | 2 +- 21 files changed, 30 insertions(+), 65 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index bbccc68d..338f1c68 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,44 +2,20 @@ [[projects]] - name = "github.com/davecgh/go-spew" - packages = ["spew"] - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" - -[[projects]] - branch = "master" - name = "github.com/google/gofuzz" + name = "github.com/modern-go/concurrent" packages = ["."] - revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" - -[[projects]] - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" + revision = "e0a39a4cb4216ea8db28e22a69f4ec25610d513a" + version = "1.0.0" [[projects]] - name = "github.com/stretchr/testify" - packages = [ - "assert", - "require" - ] - revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71" - version = "v1.2.1" - -[[projects]] - name = "github.com/v2pro/plz" - packages = [ - "concurrent", - "reflect2" - ] - revision = "10fc95fad3224a032229e59f6e7023137d82b526" - version = "0.9.1" + name = "github.com/modern-go/reflect2" + packages = ["."] + revision = "1df9eeb2bb81f327b96228865c5687bc2194af3f" + version = "1.0.0" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "64fe3937a1afce5cb551c06ff7109065c971643e082512243d1071bab428ff14" + inputs-digest = "ac7003b5a981716353a43055ab7d4c5357403cb30a60de2dbdeb446c1544beaa" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 8e7e8a65..5801ffa1 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -19,19 +19,8 @@ # name = "github.com/x/y" # version = "2.4.0" +ignored = ["github.com/davecgh/go-spew*","github.com/google/gofuzz*","github.com/stretchr/testify*"] [[constraint]] - name = "github.com/davecgh/go-spew" - version = "1.1.0" - -[[constraint]] - branch = "master" - name = "github.com/google/gofuzz" - -[[constraint]] - name = "github.com/stretchr/testify" - version = "1.1.4" - -[[constraint]] - name = "github.com/v2pro/plz" - version = "0.9.1" + name = "github.com/modern-go/reflect2" + version = "1.0.0" diff --git a/any.go b/any.go index cc5f86f8..daecfed6 100644 --- a/any.go +++ b/any.go @@ -3,7 +3,7 @@ package jsoniter import ( "errors" "fmt" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "io" "reflect" "strconv" diff --git a/config.go b/config.go index 2e7bc159..3446170b 100644 --- a/config.go +++ b/config.go @@ -2,7 +2,7 @@ package jsoniter import ( "encoding/json" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "io" "sync" "unsafe" diff --git a/extension_tests/extension_test.go b/extension_tests/extension_test.go index 302d1442..043379ea 100644 --- a/extension_tests/extension_test.go +++ b/extension_tests/extension_test.go @@ -3,7 +3,7 @@ package test import ( "github.com/json-iterator/go" "github.com/stretchr/testify/require" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "reflect" "strconv" "testing" diff --git a/extra/binary_as_string_codec.go b/extra/binary_as_string_codec.go index f5a88909..f9d8b750 100644 --- a/extra/binary_as_string_codec.go +++ b/extra/binary_as_string_codec.go @@ -4,7 +4,7 @@ import ( "github.com/json-iterator/go" "unsafe" "unicode/utf8" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" ) // safeSet holds the value true if the ASCII character with the given array diff --git a/extra/fuzzy_decoder.go b/extra/fuzzy_decoder.go index 08e23ff8..8ff1cc3d 100644 --- a/extra/fuzzy_decoder.go +++ b/extra/fuzzy_decoder.go @@ -9,7 +9,7 @@ import ( "unsafe" "github.com/json-iterator/go" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" ) const maxUint = ^uint(0) diff --git a/reflect.go b/reflect.go index b0d5832a..5c7d3a8a 100644 --- a/reflect.go +++ b/reflect.go @@ -2,7 +2,7 @@ package jsoniter import ( "fmt" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "reflect" "unsafe" ) diff --git a/reflect_array.go b/reflect_array.go index 185bbf4d..13a0b7b0 100644 --- a/reflect_array.go +++ b/reflect_array.go @@ -2,7 +2,7 @@ package jsoniter import ( "fmt" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "io" "unsafe" ) diff --git a/reflect_dynamic.go b/reflect_dynamic.go index 70209739..8b6bc8b4 100644 --- a/reflect_dynamic.go +++ b/reflect_dynamic.go @@ -1,7 +1,7 @@ package jsoniter import ( - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "reflect" "unsafe" ) diff --git a/reflect_extension.go b/reflect_extension.go index 7d1a5845..917bbe84 100644 --- a/reflect_extension.go +++ b/reflect_extension.go @@ -2,7 +2,7 @@ package jsoniter import ( "fmt" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "reflect" "sort" "strings" diff --git a/reflect_json_number.go b/reflect_json_number.go index b60455d8..98d45c1e 100644 --- a/reflect_json_number.go +++ b/reflect_json_number.go @@ -2,7 +2,7 @@ package jsoniter import ( "encoding/json" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "strconv" "unsafe" ) diff --git a/reflect_json_raw_message.go b/reflect_json_raw_message.go index fdcaf641..f2619936 100644 --- a/reflect_json_raw_message.go +++ b/reflect_json_raw_message.go @@ -2,7 +2,7 @@ package jsoniter import ( "encoding/json" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "unsafe" ) diff --git a/reflect_map.go b/reflect_map.go index 9e0706c5..f34d519f 100644 --- a/reflect_map.go +++ b/reflect_map.go @@ -2,7 +2,7 @@ package jsoniter import ( "fmt" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "reflect" "sort" "unsafe" diff --git a/reflect_marshaler.go b/reflect_marshaler.go index 8ea7bdec..58ac959a 100644 --- a/reflect_marshaler.go +++ b/reflect_marshaler.go @@ -3,7 +3,7 @@ package jsoniter import ( "encoding" "encoding/json" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "unsafe" ) diff --git a/reflect_native.go b/reflect_native.go index 63fef704..7f1e2464 100644 --- a/reflect_native.go +++ b/reflect_native.go @@ -2,7 +2,7 @@ package jsoniter import ( "encoding/base64" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "reflect" "strconv" "unsafe" diff --git a/reflect_optional.go b/reflect_optional.go index 5c675ba6..43ec71d6 100644 --- a/reflect_optional.go +++ b/reflect_optional.go @@ -1,7 +1,7 @@ package jsoniter import ( - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "reflect" "unsafe" ) diff --git a/reflect_slice.go b/reflect_slice.go index 3dd3b599..9441d79d 100644 --- a/reflect_slice.go +++ b/reflect_slice.go @@ -2,7 +2,7 @@ package jsoniter import ( "fmt" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "io" "unsafe" ) diff --git a/reflect_struct_decoder.go b/reflect_struct_decoder.go index de0b410c..e718722a 100644 --- a/reflect_struct_decoder.go +++ b/reflect_struct_decoder.go @@ -2,7 +2,7 @@ package jsoniter import ( "fmt" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "io" "strings" "unsafe" diff --git a/reflect_struct_encoder.go b/reflect_struct_encoder.go index e6014e5b..d0759cf6 100644 --- a/reflect_struct_encoder.go +++ b/reflect_struct_encoder.go @@ -2,7 +2,7 @@ package jsoniter import ( "fmt" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "io" "reflect" "unsafe" diff --git a/value_tests/value_test.go b/value_tests/value_test.go index b1528e1e..ec1bed77 100644 --- a/value_tests/value_test.go +++ b/value_tests/value_test.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/json-iterator/go" "github.com/stretchr/testify/require" - "github.com/v2pro/plz/reflect2" + "github.com/modern-go/reflect2" "testing" )