aboutsummaryrefslogtreecommitdiffstats
path: root/modules/web
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2023-07-04 20:36:08 +0200
committerGitHub <noreply@github.com>2023-07-04 18:36:08 +0000
commit88f835192d1a554d233b0ec4daa33276b7eb2910 (patch)
tree438140c295791e64a3b78dcfeae57701bcf296c3 /modules/web
parent00dbba7f4266032a2b91b760e7c611950ffad096 (diff)
downloadgitea-88f835192d1a554d233b0ec4daa33276b7eb2910.tar.gz
gitea-88f835192d1a554d233b0ec4daa33276b7eb2910.zip
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](https://github.com/golang/go/commit/2580d0e08d5e9f979b943758d3c49877fb2324cb).
Diffstat (limited to 'modules/web')
-rw-r--r--modules/web/middleware/binding.go4
-rw-r--r--modules/web/route.go44
-rw-r--r--modules/web/routing/context.go2
-rw-r--r--modules/web/routing/funcinfo.go2
-rw-r--r--modules/web/routing/requestrecord.go2
5 files changed, 27 insertions, 27 deletions
diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go
index 8b74a864d9..d9bcdf3b2a 100644
--- a/modules/web/middleware/binding.go
+++ b/modules/web/middleware/binding.go
@@ -25,7 +25,7 @@ func init() {
}
// AssignForm assign form values back to the template data.
-func AssignForm(form interface{}, data map[string]interface{}) {
+func AssignForm(form any, data map[string]any) {
typ := reflect.TypeOf(form)
val := reflect.ValueOf(form)
@@ -79,7 +79,7 @@ func GetInclude(field reflect.StructField) string {
}
// Validate validate TODO:
-func Validate(errs binding.Errors, data map[string]interface{}, f Form, l translation.Locale) binding.Errors {
+func Validate(errs binding.Errors, data map[string]any, f Form, l translation.Locale) binding.Errors {
if errs.Len() == 0 {
return errs
}
diff --git a/modules/web/route.go b/modules/web/route.go
index db511aeb18..8685062a8e 100644
--- a/modules/web/route.go
+++ b/modules/web/route.go
@@ -25,12 +25,12 @@ func Bind[T any](_ T) http.HandlerFunc {
}
// SetForm set the form object
-func SetForm(dataStore middleware.ContextDataStore, obj interface{}) {
+func SetForm(dataStore middleware.ContextDataStore, obj any) {
dataStore.GetData()["__form"] = obj
}
// GetForm returns the validate form information
-func GetForm(dataStore middleware.ContextDataStore) interface{} {
+func GetForm(dataStore middleware.ContextDataStore) any {
return dataStore.GetData()["__form"]
}
@@ -38,7 +38,7 @@ func GetForm(dataStore middleware.ContextDataStore) interface{} {
type Route struct {
R chi.Router
curGroupPrefix string
- curMiddlewares []interface{}
+ curMiddlewares []any
}
// NewRoute creates a new route
@@ -48,14 +48,14 @@ func NewRoute() *Route {
}
// Use supports two middlewares
-func (r *Route) Use(middlewares ...interface{}) {
+func (r *Route) Use(middlewares ...any) {
for _, m := range middlewares {
r.R.Use(toHandlerProvider(m))
}
}
// Group mounts a sub-Router along a `pattern` string.
-func (r *Route) Group(pattern string, fn func(), middlewares ...interface{}) {
+func (r *Route) Group(pattern string, fn func(), middlewares ...any) {
previousGroupPrefix := r.curGroupPrefix
previousMiddlewares := r.curMiddlewares
r.curGroupPrefix += pattern
@@ -111,53 +111,53 @@ func (r *Route) Mount(pattern string, subR *Route) {
}
// Any delegate requests for all methods
-func (r *Route) Any(pattern string, h ...interface{}) {
+func (r *Route) Any(pattern string, h ...any) {
middlewares, handlerFunc := r.wrapMiddlewareAndHandler(h)
r.R.With(middlewares...).HandleFunc(r.getPattern(pattern), handlerFunc)
}
// RouteMethods delegate special methods, it is an alias of "Methods", while the "pattern" is the first parameter
-func (r *Route) RouteMethods(pattern, methods string, h ...interface{}) {
+func (r *Route) RouteMethods(pattern, methods string, h ...any) {
r.Methods(methods, pattern, h)
}
// Delete delegate delete method
-func (r *Route) Delete(pattern string, h ...interface{}) {
+func (r *Route) Delete(pattern string, h ...any) {
r.Methods("DELETE", pattern, h)
}
// Get delegate get method
-func (r *Route) Get(pattern string, h ...interface{}) {
+func (r *Route) Get(pattern string, h ...any) {
r.Methods("GET", pattern, h)
}
// GetOptions delegate get and options method
-func (r *Route) GetOptions(pattern string, h ...interface{}) {
+func (r *Route) GetOptions(pattern string, h ...any) {
r.Methods("GET,OPTIONS", pattern, h)
}
// PostOptions delegate post and options method
-func (r *Route) PostOptions(pattern string, h ...interface{}) {
+func (r *Route) PostOptions(pattern string, h ...any) {
r.Methods("POST,OPTIONS", pattern, h)
}
// Head delegate head method
-func (r *Route) Head(pattern string, h ...interface{}) {
+func (r *Route) Head(pattern string, h ...any) {
r.Methods("HEAD", pattern, h)
}
// Post delegate post method
-func (r *Route) Post(pattern string, h ...interface{}) {
+func (r *Route) Post(pattern string, h ...any) {
r.Methods("POST", pattern, h)
}
// Put delegate put method
-func (r *Route) Put(pattern string, h ...interface{}) {
+func (r *Route) Put(pattern string, h ...any) {
r.Methods("PUT", pattern, h)
}
// Patch delegate patch method
-func (r *Route) Patch(pattern string, h ...interface{}) {
+func (r *Route) Patch(pattern string, h ...any) {
r.Methods("PATCH", pattern, h)
}
@@ -172,7 +172,7 @@ func (r *Route) NotFound(h http.HandlerFunc) {
}
// Combo delegates requests to Combo
-func (r *Route) Combo(pattern string, h ...interface{}) *Combo {
+func (r *Route) Combo(pattern string, h ...any) *Combo {
return &Combo{r, pattern, h}
}
@@ -180,35 +180,35 @@ func (r *Route) Combo(pattern string, h ...interface{}) *Combo {
type Combo struct {
r *Route
pattern string
- h []interface{}
+ h []any
}
// Get delegates Get method
-func (c *Combo) Get(h ...interface{}) *Combo {
+func (c *Combo) Get(h ...any) *Combo {
c.r.Get(c.pattern, append(c.h, h...)...)
return c
}
// Post delegates Post method
-func (c *Combo) Post(h ...interface{}) *Combo {
+func (c *Combo) Post(h ...any) *Combo {
c.r.Post(c.pattern, append(c.h, h...)...)
return c
}
// Delete delegates Delete method
-func (c *Combo) Delete(h ...interface{}) *Combo {
+func (c *Combo) Delete(h ...any) *Combo {
c.r.Delete(c.pattern, append(c.h, h...)...)
return c
}
// Put delegates Put method
-func (c *Combo) Put(h ...interface{}) *Combo {
+func (c *Combo) Put(h ...any) *Combo {
c.r.Put(c.pattern, append(c.h, h...)...)
return c
}
// Patch delegates Patch method
-func (c *Combo) Patch(h ...interface{}) *Combo {
+func (c *Combo) Patch(h ...any) *Combo {
c.r.Patch(c.pattern, append(c.h, h...)...)
return c
}
diff --git a/modules/web/routing/context.go b/modules/web/routing/context.go
index 0d5e765543..c5e85a415b 100644
--- a/modules/web/routing/context.go
+++ b/modules/web/routing/context.go
@@ -37,7 +37,7 @@ func MarkLongPolling(resp http.ResponseWriter, req *http.Request) {
}
// UpdatePanicError updates a context's error info, a panic may be recovered by other middlewares, but we still need to know that.
-func UpdatePanicError(ctx context.Context, err interface{}) {
+func UpdatePanicError(ctx context.Context, err any) {
record, ok := ctx.Value(contextKey).(*requestRecord)
if !ok {
return
diff --git a/modules/web/routing/funcinfo.go b/modules/web/routing/funcinfo.go
index 499bc2c7aa..f4e9731a63 100644
--- a/modules/web/routing/funcinfo.go
+++ b/modules/web/routing/funcinfo.go
@@ -35,7 +35,7 @@ func (info *FuncInfo) String() string {
}
// GetFuncInfo returns the FuncInfo for a provided function and friendlyname
-func GetFuncInfo(fn interface{}, friendlyName ...string) *FuncInfo {
+func GetFuncInfo(fn any, friendlyName ...string) *FuncInfo {
// ptr represents the memory position of the function passed in as v.
// This will be used as program counter in FuncForPC below
ptr := reflect.ValueOf(fn).Pointer()
diff --git a/modules/web/routing/requestrecord.go b/modules/web/routing/requestrecord.go
index 34a2d33893..cc61fc4d34 100644
--- a/modules/web/routing/requestrecord.go
+++ b/modules/web/routing/requestrecord.go
@@ -24,5 +24,5 @@ type requestRecord struct {
// mutable fields
isLongPolling bool
funcInfo *FuncInfo
- panicError interface{}
+ panicError any
}