forked from mitchellh/mapstructure
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: backport comparable check to <1.20
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
- Loading branch information
1 parent
58a4c3b
commit a93507f
Showing
3 changed files
with
55 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
//go:build !go1.20 | ||
|
||
package mapstructure | ||
|
||
import "reflect" | ||
|
||
func isComparable(v reflect.Value) bool { | ||
k := v.Kind() | ||
switch k { | ||
case reflect.Invalid: | ||
return false | ||
|
||
case reflect.Array: | ||
switch v.Type().Elem().Kind() { | ||
case reflect.Interface, reflect.Array, reflect.Struct: | ||
for i := 0; i < v.Type().Len(); i++ { | ||
// if !v.Index(i).Comparable() { | ||
if !isComparable(v.Index(i)) { | ||
return false | ||
} | ||
} | ||
return true | ||
} | ||
return v.Type().Comparable() | ||
|
||
case reflect.Interface: | ||
// return v.Elem().Comparable() | ||
return isComparable(v.Elem()) | ||
|
||
case reflect.Struct: | ||
for i := 0; i < v.NumField(); i++ { | ||
return false | ||
|
||
// if !v.Field(i).Comparable() { | ||
if !isComparable(v.Field(i)) { | ||
return false | ||
} | ||
} | ||
return true | ||
|
||
default: | ||
return v.Type().Comparable() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
//go:build go1.20 | ||
|
||
package mapstructure | ||
|
||
import "reflect" | ||
|
||
// TODO: remove once we drop support for Go <1.20 | ||
func isComparable(v reflect.Value) bool { | ||
return v.Comparable() | ||
} |