Param_cleanup

lex.go

@@ -265,7 +265,7 @@ func lexProtocol(l *lexer) stateFn {
 		case r == ' ':
 			l.emit(itemProtocol, true)
 			return lexSourceAddress
-		case !(unicode.IsLetter(r) || unicode.IsDigit(r) || (l.len() > 0 && r == '-')):
+		case !unicode.IsLetter(r) && !unicode.IsDigit(r) && l.len() > 0 && r != '-':
 			return l.errorf("invalid character %q for a rule protocol", r)
 		}
 	}

parser.go

@@ -111,7 +111,7 @@ func parseContent(content string) ([]byte, error) {
 
 	b = hexRE.ReplaceAllStringFunc(b,
 		func(h string) string {
-			r, err := hex.DecodeString(strings.Replace(strings.Trim(h, "|"), " ", "", -1))
+			r, err := hex.DecodeString(strings.ReplaceAll(strings.Trim(h, "|"), " ", ""))
 			if err != nil {
 				panic("invalid hexRE regexp")
 			}
@@ -408,7 +408,7 @@ func unquote(s string) string {
 	if strings.IndexByte(s, '"') < 0 {
 		return s
 	}
-	return strings.Replace(s, `\"`, `"`, -1)
+	return strings.ReplaceAll(s, `\"`, `"`)
 }
 
 func inSlice(str string, strings []string) bool {

rule.go

@@ -850,7 +850,7 @@ func (p PCRE) String() string {
 
 	// escape quote signs, if necessary
 	if bytes.IndexByte(pattern, '"') > -1 {
-		pattern = bytes.Replace(pattern, []byte(`"`), []byte(`\"`), -1)
+		pattern = bytes.ReplaceAll(pattern, []byte(`"`), []byte(`\"`))
 	}
 
 	var s strings.Builder