Restore usage of slices package

common/reflect/marshal.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"reflect"
+	"slices"
 	"strings"
 
 	cnet "github.com/xtls/xray-core/common/net"
@@ -31,9 +32,6 @@ func JSONMarshalWithoutEscape(t interface{}) ([]byte, error) {
 }
 
 func marshalTypedMessage(v *cserial.TypedMessage, ignoreNullValue bool, insertTypeInfo bool) interface{} {
-	if v == nil {
-		return nil
-	}
 	tmsg, err := v.GetInstance()
 	if err != nil {
 		return nil
@@ -194,9 +192,8 @@ func marshalKnownType(v interface{}, ignoreNullValue bool, insertTypeInfo bool)
 	}
 }
 
-func isValueKind(kind reflect.Kind) bool {
-	switch kind {
-	case reflect.Bool,
+var valueKinds = []reflect.Kind{
+	reflect.Bool,
 	reflect.Int,
 	reflect.Int8,
 	reflect.Int16,
@@ -212,11 +209,11 @@ func isValueKind(kind reflect.Kind) bool {
 	reflect.Float64,
 	reflect.Complex64,
 	reflect.Complex128,
-		reflect.String:
-		return true
-	default:
-		return false
-	}
+	reflect.String,
+}
+
+func isValueKind(kind reflect.Kind) bool {
+	return slices.Contains(valueKinds, kind)
 }
 
 func marshalInterface(v interface{}, ignoreNullValue bool, insertTypeInfo bool) interface{} {

core/config.go

@@ -2,6 +2,7 @@ package core
 
 import (
 	"io"
+	"slices"
 	"strings"
 
 	"github.com/xtls/xray-core/common"
@@ -64,14 +65,11 @@ func GetMergedConfig(args cmdarg.Arg) (string, error) {
 	supported := []string{"json", "yaml", "toml"}
 	for _, file := range args {
 		format := getFormat(file)
-		for _, s := range supported {
-			if s == format {
+		if slices.Contains(supported, format) {
 			files = append(files, &ConfigSource{
 				Name:   file,
 				Format: format,
 			})
-				break
-			}
 		}
 	}
 	return ConfigMergedFormFiles(files)