From 33c88bd2bb543a726274cdf52899edb0639cf5f6 Mon Sep 17 00:00:00 2001
From: gopherorg <gopherworld@icloud.com>
Date: Sat, 28 Jun 2025 03:04:09 +0800
Subject: [PATCH] refactor: replace HasPrefix+TrimPrefix with CutPrefix (#7095)

Signed-off-by: gopherorg <gopherworld@icloud.com>
---
 modules/caddyevents/app.go                  | 4 ++--
 modules/caddyhttp/fileserver/staticfiles.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/caddyevents/app.go b/modules/caddyevents/app.go
index 9fc8fa8ed..6c2abbf7c 100644
--- a/modules/caddyevents/app.go
+++ b/modules/caddyevents/app.go
@@ -249,8 +249,8 @@ func (app *App) Emit(ctx caddy.Context, eventName string, data map[string]any) c
 			return e.Data, true
 		}
 
-		if strings.HasPrefix(key, "event.data.") {
-			key = strings.TrimPrefix(key, "event.data.")
+		if after, ok0 := strings.CutPrefix(key, "event.data."); ok0 {
+			key = after
 			if val, ok := e.Data[key]; ok {
 				return val, true
 			}
diff --git a/modules/caddyhttp/fileserver/staticfiles.go b/modules/caddyhttp/fileserver/staticfiles.go
index 5c2ea7018..b871fe995 100644
--- a/modules/caddyhttp/fileserver/staticfiles.go
+++ b/modules/caddyhttp/fileserver/staticfiles.go
@@ -684,11 +684,11 @@ func fileHidden(filename string, hide []string) bool {
 					return true
 				}
 			}
-		} else if strings.HasPrefix(filename, h) {
+		} else if after, ok := strings.CutPrefix(filename, h); ok {
 			// if there is a separator in h, and filename is exactly
 			// prefixed with h, then we can do a prefix match so that
 			// "/foo" matches "/foo/bar" but not "/foobar".
-			withoutPrefix := strings.TrimPrefix(filename, h)
+			withoutPrefix := after
 			if strings.HasPrefix(withoutPrefix, separator) {
 				return true
 			}