GitHubMirror/go-highlite
1
0
Fork 0
mirror of https://github.com/rwinkhart/go-highlite.git synced 2026-09-06 08:57:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Modernize: replace "interface{}" with "any"

Browse Source
This commit is contained in:
RandyTheSilly
2025-06-14 13:47:45 -04:00
parent d68a3e73b3
commit 11161c71cd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parser.go
+8 -8
View File
@@ -79,7 +79,7 @@ func ParseDef(input []byte) (s *Def, err error) {
} }
}() }()
var rules map[interface{}]interface{} var rules map[any]any
if err = yaml.Unmarshal(input, &rules); err != nil { if err = yaml.Unmarshal(input, &rules); err != nil {
return nil, err return nil, err
} }
@@ -92,7 +92,7 @@ func ParseDef(input []byte) (s *Def, err error) {
filetype := v.(string) filetype := v.(string)
s.FileType = filetype s.FileType = filetype
case "detect": case "detect":
ftdetect := v.(map[interface{}]interface{}) ftdetect := v.(map[any]any)
if len(ftdetect) >= 1 { if len(ftdetect) >= 1 {
syntax, err := regexp.Compile(ftdetect["filename"].(string)) syntax, err := regexp.Compile(ftdetect["filename"].(string))
if err != nil { if err != nil {
@@ -110,7 +110,7 @@ func ParseDef(input []byte) (s *Def, err error) {
s.ftdetect = append(s.ftdetect, header) s.ftdetect = append(s.ftdetect, header)
} }
case "rules": case "rules":
inputRules := v.([]interface{}) inputRules := v.([]any)
rules, err := parseRules(inputRules, nil) rules, err := parseRules(inputRules, nil)
if err != nil { if err != nil {
@@ -162,11 +162,11 @@ func resolveIncludesInRegion(defs []*Def, region *region) {
} }
} }
func parseRules(input []interface{}, curRegion *region) (*rules, error) { func parseRules(input []any, curRegion *region) (*rules, error) {
rules := new(rules) rules := new(rules)
for _, v := range input { for _, v := range input {
rule := v.(map[interface{}]interface{}) rule := v.(map[any]any)
for k, val := range rule { for k, val := range rule {
group := k group := k
@@ -189,7 +189,7 @@ func parseRules(input []interface{}, curRegion *region) (*rules, error) {
groupNum := Groups[groupStr] groupNum := Groups[groupStr]
rules.patterns = append(rules.patterns, &pattern{groupNum, r}) rules.patterns = append(rules.patterns, &pattern{groupNum, r})
} }
case map[interface{}]interface{}: case map[any]any:
// region // region
region, err := parseRegion(group.(string), object, curRegion) region, err := parseRegion(group.(string), object, curRegion)
if err != nil { if err != nil {
@@ -205,7 +205,7 @@ func parseRules(input []interface{}, curRegion *region) (*rules, error) {
return rules, nil return rules, nil
} }
func parseRegion(group string, regionInfo map[interface{}]interface{}, prevRegion *region) (*region, error) { func parseRegion(group string, regionInfo map[any]any, prevRegion *region) (*region, error) {
var err error var err error
region := new(region) region := new(region)
@@ -255,7 +255,7 @@ func parseRegion(group string, regionInfo map[interface{}]interface{}, prevRegio
region.limitGroup = region.group region.limitGroup = region.group
} }
region.rules, err = parseRules(regionInfo["rules"].([]interface{}), region) region.rules, err = parseRules(regionInfo["rules"].([]any), region)
if err != nil { if err != nil {
return nil, err return nil, err