Skip to content

Commit 600ebd9

Browse files
authored
♻️ Refactor: replace isInCharset with bytes.IndexByte (#3342)
1 parent 4177ab4 commit 600ebd9

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

ctx.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ func (c *DefaultCtx) getLocationFromRoute(route Route, params Map) (string, erro
13491349

13501350
for key, val := range params {
13511351
isSame := key == segment.ParamName || (!c.app.config.CaseSensitive && utils.EqualFold(key, segment.ParamName))
1352-
isGreedy := segment.IsGreedy && len(key) == 1 && isInCharset(key[0], greedyParameters)
1352+
isGreedy := segment.IsGreedy && len(key) == 1 && bytes.IndexByte(greedyParameters, key[0]) != -1
13531353
if isSame || isGreedy {
13541354
_, err := buf.WriteString(utils.ToString(val))
13551355
if err != nil {

path.go

+2-11
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package fiber
88

99
import (
10+
"bytes"
1011
"regexp"
1112
"strconv"
1213
"strings"
@@ -308,7 +309,7 @@ func (routeParser *routeParser) analyseParameterPart(pattern string, customConst
308309
parameterEndPosition = 0
309310
case parameterEndPosition == -1:
310311
parameterEndPosition = len(pattern) - 1
311-
case !isInCharset(pattern[parameterEndPosition+1], parameterDelimiterChars):
312+
case bytes.IndexByte(parameterDelimiterChars, pattern[parameterEndPosition+1]) == -1:
312313
parameterEndPosition++
313314
}
314315

@@ -397,16 +398,6 @@ func (routeParser *routeParser) analyseParameterPart(pattern string, customConst
397398
return n, segment
398399
}
399400

400-
// isInCharset check is the given character in the charset list
401-
func isInCharset(searchChar byte, charset []byte) bool {
402-
for _, char := range charset {
403-
if char == searchChar {
404-
return true
405-
}
406-
}
407-
return false
408-
}
409-
410401
// findNextCharsetPosition search the next char position from the charset
411402
func findNextCharsetPosition(search string, charset []byte) int {
412403
nextPosition := -1

0 commit comments

Comments
 (0)