ALHP/ALHP.GO
6
42
Fork 9
Code Issues 25 Pull Requests Projects Releases Wiki Activity

use any instead of interface{}

Browse Source
This commit is contained in:
Giovanni Harting
2022-12-27 18:15:36 +01:00
parent f93d14c332
commit 6088643ec4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utils.go
View File

@@ -401,7 +401,7 @@ func movePackagesLive(fullRepo string) error {
return nil return nil
} }
func packages2slice(pkgs interface{}) []string { func packages2slice(pkgs any) []string {
switch v := pkgs.(type) { switch v := pkgs.(type) {
case []srcinfo.Package: case []srcinfo.Package:
var sPkgs []string var sPkgs []string
@@ -752,7 +752,7 @@ func syncMarchs() error {
if err != nil { if err != nil {
return err return err
} }
var flagCfg map[string]interface{} var flagCfg map[string]any
err = yaml.Unmarshal(flagConfigRaw, &flagCfg) err = yaml.Unmarshal(flagConfigRaw, &flagCfg)
if err != nil { if err != nil {
return err return err
@@ -805,10 +805,10 @@ func replaceStringsFromMap(str string, replace map[string]string) string {
return str return str
} }
func parseFlagSubSection(list interface{}, res []string, replaceMap map[string]string) []string { func parseFlagSubSection(list any, res []string, replaceMap map[string]string) []string {
for _, cEntry := range list.([]interface{}) { for _, cEntry := range list.([]any) {
switch ce := cEntry.(type) { switch ce := cEntry.(type) {
case map[interface{}]interface{}: case map[any]any:
for k, v := range ce { for k, v := range ce {
if v == nil { if v == nil {
res = append(res[:Find(res, k.(string))], res[Find(res, k.(string))+1:]...) res = append(res[:Find(res, k.(string))], res[Find(res, k.(string))+1:]...)
@@ -828,10 +828,10 @@ func parseFlagSubSection(list interface{}, res []string, replaceMap map[string]s
return res return res
} }
func parseFlagSection(section interface{}, makepkgConf, march string) (string, error) { func parseFlagSection(section any, makepkgConf, march string) (string, error) {
replaceMap := map[string]string{"$level$": march[len(march)-2:], "$march$": march, "$buildproc$": strconv.Itoa(conf.Build.Makej)} replaceMap := map[string]string{"$level$": march[len(march)-2:], "$march$": march, "$buildproc$": strconv.Itoa(conf.Build.Makej)}
if ct, ok := section.(map[interface{}]interface{}); ok { if ct, ok := section.(map[any]any); ok {
for subSec, subMap := range ct { for subSec, subMap := range ct {
varsReg := reVar.FindAllStringSubmatch(makepkgConf, -1) varsReg := reVar.FindAllStringSubmatch(makepkgConf, -1)
if varsReg == nil { if varsReg == nil {
@@ -873,7 +873,7 @@ func parseFlagSection(section interface{}, makepkgConf, march string) (string, e
} }
//goland:noinspection SpellCheckingInspection //goland:noinspection SpellCheckingInspection
func setupMakepkg(march string, flags map[string]interface{}) error { func setupMakepkg(march string, flags map[string]any) error {
lMakepkg := filepath.Join(conf.Basedir.Work, makepkgDir, fmt.Sprintf(makepkg, march)) lMakepkg := filepath.Join(conf.Basedir.Work, makepkgDir, fmt.Sprintf(makepkg, march))
lMakepkgLTO := filepath.Join(conf.Basedir.Work, makepkgDir, fmt.Sprintf(makepkgLTO, march)) lMakepkgLTO := filepath.Join(conf.Basedir.Work, makepkgDir, fmt.Sprintf(makepkgLTO, march))
@@ -912,7 +912,7 @@ func setupMakepkg(march string, flags map[string]interface{}) error {
return nil return nil
} }
func Contains(s interface{}, str string) bool { func Contains(s any, str string) bool {
switch v := s.(type) { switch v := s.(type) {
case []string: case []string:
if i := Find(v, str); i != -1 { if i := Find(v, str); i != -1 {