@@ -11,7 +11,6 @@ import (
11
11
"reflect"
12
12
"strconv"
13
13
"strings"
14
- "unsafe"
15
14
16
15
"github.com/dlclark/regexp2"
17
16
)
@@ -747,20 +746,15 @@ func regexpToRegexp(path *regexp2.Regexp, tokens *[]Token) *regexp2.Regexp {
747
746
}
748
747
749
748
if totalGroupCount > 0 {
750
- newTokens := append (make ([]Token , 0 ), * tokens ... )
751
-
752
749
for i := 0 ; i < totalGroupCount ; i ++ {
753
- newTokens = append (newTokens , Token {
750
+ * tokens = append (* tokens , Token {
754
751
Name : i ,
755
752
Prefix : "" ,
756
753
Suffix : "" ,
757
754
Modifier : "" ,
758
755
Pattern : "" ,
759
756
})
760
757
}
761
-
762
- hdr := (* reflect .SliceHeader )(unsafe .Pointer (tokens ))
763
- * hdr = * (* reflect .SliceHeader )(unsafe .Pointer (& newTokens ))
764
758
}
765
759
}
766
760
@@ -827,12 +821,6 @@ func tokensToRegExp(rawTokens []interface{}, tokens *[]Token, options *Options)
827
821
route = "^"
828
822
}
829
823
830
- var newTokens []Token
831
- if tokens != nil {
832
- newTokens = make ([]Token , 0 , len (* tokens )+ len (rawTokens ))
833
- newTokens = append (newTokens , * tokens ... )
834
- }
835
-
836
824
// Iterate over the tokens and create our regexp string.
837
825
for _ , token := range rawTokens {
838
826
if str , ok := token .(string ); ok {
@@ -855,7 +843,7 @@ func tokensToRegExp(rawTokens []interface{}, tokens *[]Token, options *Options)
855
843
856
844
if token .Pattern != "" {
857
845
if tokens != nil {
858
- newTokens = append (newTokens , token )
846
+ * tokens = append (* tokens , token )
859
847
}
860
848
if prefix != "" || suffix != "" {
861
849
if token .Modifier == "+" || token .Modifier == "*" {
@@ -879,11 +867,6 @@ func tokensToRegExp(rawTokens []interface{}, tokens *[]Token, options *Options)
879
867
}
880
868
}
881
869
882
- if tokens != nil {
883
- hdr := (* reflect .SliceHeader )(unsafe .Pointer (tokens ))
884
- * hdr = * (* reflect .SliceHeader )(unsafe .Pointer (& newTokens ))
885
- }
886
-
887
870
if end {
888
871
if ! strict {
889
872
route += delimiter + "?"
0 commit comments