jcarr
/
go-arg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vendor: update go-scalar to the latest version 

Allows to use values (not pointer) with custom TextUnmarshaler.

Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
This commit is contained in:
Pavel Borzenkov 2018-11-20 12:18:45 +03:00
parent f7c0423bd1
commit 5225bc2f3c
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -1,14 +1,14 @@
{ {
"ImportPath": "github.com/alexflint/go-arg", "ImportPath": "github.com/alexflint/go-arg",
"GoVersion": "go1.7", "GoVersion": "go1.7",
"GodepVersion": "v79", "GodepVersion": "v80",
"Packages": [ "Packages": [
"." "."
], ],
"Deps": [ "Deps": [
{ {
"ImportPath": "github.com/alexflint/go-scalar", "ImportPath": "github.com/alexflint/go-scalar",
"Rev": "45e5d6cd8605faef82fda2bacc59e734a0b6f1f0" "Rev": "6ab8ad5e1c5b25ca2783fe83f493c3ab471407e2"
}, },
{ {
"ImportPath": "github.com/stretchr/testify/assert", "ImportPath": "github.com/stretchr/testify/assert",

19
vendor/github.com/alexflint/go-scalar/scalar.go generated vendored
View File

@ -18,7 +18,6 @@ var (
textUnmarshalerType = reflect.TypeOf([]encoding.TextUnmarshaler{}).Elem() textUnmarshalerType = reflect.TypeOf([]encoding.TextUnmarshaler{}).Elem()
durationType = reflect.TypeOf(time.Duration(0)) durationType = reflect.TypeOf(time.Duration(0))
mailAddressType = reflect.TypeOf(mail.Address{}) mailAddressType = reflect.TypeOf(mail.Address{})
ipType = reflect.TypeOf(net.IP{})
macType = reflect.TypeOf(net.HardwareAddr{}) macType = reflect.TypeOf(net.HardwareAddr{})
) )
@ -47,6 +46,13 @@ func ParseValue(v reflect.Value, s string) error {
if scalar, ok := v.Interface().(encoding.TextUnmarshaler); ok { if scalar, ok := v.Interface().(encoding.TextUnmarshaler); ok {
return scalar.UnmarshalText([]byte(s)) return scalar.UnmarshalText([]byte(s))
} }
// If it's a value instead of a pointer, check that we can unmarshal it
// via TextUnmarshaler as well
if v.CanAddr() {
if scalar, ok := v.Addr().Interface().(encoding.TextUnmarshaler); ok {
return scalar.UnmarshalText([]byte(s))
}
}
// If we have a pointer then dereference it // If we have a pointer then dereference it
if v.Kind() == reflect.Ptr { if v.Kind() == reflect.Ptr {
@ -73,13 +79,6 @@ func ParseValue(v reflect.Value, s string) error {
} }
v.Set(reflect.ValueOf(*addr)) v.Set(reflect.ValueOf(*addr))
return nil return nil
case net.IP:
ip := net.ParseIP(s)
if ip == nil {
return fmt.Errorf(`invalid IP address: "%s"`, s)
}
v.Set(reflect.ValueOf(ip))
return nil
case net.HardwareAddr: case net.HardwareAddr:
ip, err := net.ParseMAC(s) ip, err := net.ParseMAC(s)
if err != nil { if err != nil {
@ -126,7 +125,7 @@ func ParseValue(v reflect.Value, s string) error {
// CanParse returns true if the type can be parsed from a string. // CanParse returns true if the type can be parsed from a string.
func CanParse(t reflect.Type) bool { func CanParse(t reflect.Type) bool {
// If it implements encoding.TextUnmarshaler then use that // If it implements encoding.TextUnmarshaler then use that
if t.Implements(textUnmarshalerType) { if t.Implements(textUnmarshalerType) || reflect.PtrTo(t).Implements(textUnmarshalerType) {
return true return true
} }
@ -137,7 +136,7 @@ func CanParse(t reflect.Type) bool {
// Check for other special types // Check for other special types
switch t { switch t {
case durationType, mailAddressType, ipType, macType: case durationType, mailAddressType, macType:
return true return true
} }