Merge pull request coreos#263 from muesli/unit-bytes-contains

Luca Bruno · web-flow · commit 9002847aa142 · 2018-10-31T09:50:51.000+01:00
unit: use ContainsAny instead of IndexAny
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,6 @@ env:
   global:
     - IMPORTPATH=github.com/coreos/go-systemd
     - GOPATH=/opt
-    - GO15VENDOREXPERIMENT=1
     - DEP_BINDIR=/tmp
     - BUILD_DIR=/opt/src/github.com/coreos/go-systemd
   matrix:
diff --git a/unit/deserialize.go b/unit/deserialize.go
@@ -88,7 +88,7 @@ func (l *lexer) lex() {
 				l.errchan <- err
 				return
 			}
-			if bytes.IndexAny(line, SYSTEMD_NEWLINE) == -1 {
+			if !bytes.ContainsAny(line, SYSTEMD_NEWLINE) {
 				l.errchan <- ErrLineTooLong
 				return
 			}

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func (l *lexer) lex() {`
`88`	`88`	`l.errchan <- err`
`89`	`89`	`return`
`90`	`90`	`}`
`91`		`- if bytes.IndexAny(line, SYSTEMD_NEWLINE) == -1 {`
	`91`	`+ if !bytes.ContainsAny(line, SYSTEMD_NEWLINE) {`
`92`	`92`	`l.errchan <- ErrLineTooLong`
`93`	`93`	`return`
`94`	`94`	`}`