mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 00:20:25 +08:00 
			
		
		
		
	Replace interface{} with any (#25686)
				
					
				
			Result of running `perl -p -i -e 's#interface\{\}#any#g' **/*` and `make fmt`.
Basically the same [as golang did](2580d0e08d).
			
			
This commit is contained in:
		@@ -63,7 +63,7 @@ Outputs to 'cert.pem' and 'key.pem' and will overwrite existing files.`,
 | 
			
		||||
	},
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func publicKey(priv interface{}) interface{} {
 | 
			
		||||
func publicKey(priv any) any {
 | 
			
		||||
	switch k := priv.(type) {
 | 
			
		||||
	case *rsa.PrivateKey:
 | 
			
		||||
		return &k.PublicKey
 | 
			
		||||
@@ -74,7 +74,7 @@ func publicKey(priv interface{}) interface{} {
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func pemBlockForKey(priv interface{}) *pem.Block {
 | 
			
		||||
func pemBlockForKey(priv any) *pem.Block {
 | 
			
		||||
	switch k := priv.(type) {
 | 
			
		||||
	case *rsa.PrivateKey:
 | 
			
		||||
		return &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(k)}
 | 
			
		||||
@@ -94,7 +94,7 @@ func runCert(c *cli.Context) error {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	var priv interface{}
 | 
			
		||||
	var priv any
 | 
			
		||||
	var err error
 | 
			
		||||
	switch c.String("ecdsa-curve") {
 | 
			
		||||
	case "":
 | 
			
		||||
 
 | 
			
		||||
@@ -161,7 +161,7 @@ It can be used for backup and capture Gitea server image to send to maintainer`,
 | 
			
		||||
	},
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func fatal(format string, args ...interface{}) {
 | 
			
		||||
func fatal(format string, args ...any) {
 | 
			
		||||
	fmt.Fprintf(os.Stderr, format+"\n", args...)
 | 
			
		||||
	log.Fatal(format, args...)
 | 
			
		||||
}
 | 
			
		||||
@@ -236,7 +236,7 @@ func runDump(ctx *cli.Context) error {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	var iface interface{}
 | 
			
		||||
	var iface any
 | 
			
		||||
	if fileName == "-" {
 | 
			
		||||
		iface, err = archiver.ByExtension(fmt.Sprintf(".%s", outType))
 | 
			
		||||
	} else {
 | 
			
		||||
 
 | 
			
		||||
@@ -178,7 +178,7 @@ func runAddConnLogger(c *cli.Context) error {
 | 
			
		||||
	defer cancel()
 | 
			
		||||
 | 
			
		||||
	setup(ctx, c.Bool("debug"))
 | 
			
		||||
	vals := map[string]interface{}{}
 | 
			
		||||
	vals := map[string]any{}
 | 
			
		||||
	mode := "conn"
 | 
			
		||||
	vals["net"] = "tcp"
 | 
			
		||||
	if c.IsSet("protocol") {
 | 
			
		||||
@@ -208,7 +208,7 @@ func runAddFileLogger(c *cli.Context) error {
 | 
			
		||||
	defer cancel()
 | 
			
		||||
 | 
			
		||||
	setup(ctx, c.Bool("debug"))
 | 
			
		||||
	vals := map[string]interface{}{}
 | 
			
		||||
	vals := map[string]any{}
 | 
			
		||||
	mode := "file"
 | 
			
		||||
	if c.IsSet("filename") {
 | 
			
		||||
		vals["filename"] = c.String("filename")
 | 
			
		||||
@@ -236,7 +236,7 @@ func runAddFileLogger(c *cli.Context) error {
 | 
			
		||||
	return commonAddLogger(c, mode, vals)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func commonAddLogger(c *cli.Context, mode string, vals map[string]interface{}) error {
 | 
			
		||||
func commonAddLogger(c *cli.Context, mode string, vals map[string]any) error {
 | 
			
		||||
	if len(c.String("level")) > 0 {
 | 
			
		||||
		vals["level"] = log.LevelFromString(c.String("level")).String()
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -95,7 +95,7 @@ var (
 | 
			
		||||
 | 
			
		||||
// fail prints message to stdout, it's mainly used for git serv and git hook commands.
 | 
			
		||||
// The output will be passed to git client and shown to user.
 | 
			
		||||
func fail(ctx context.Context, userMessage, logMsgFmt string, args ...interface{}) error {
 | 
			
		||||
func fail(ctx context.Context, userMessage, logMsgFmt string, args ...any) error {
 | 
			
		||||
	if userMessage == "" {
 | 
			
		||||
		userMessage = "Internal Server Error (no specific error)"
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user