update dependency versions
Most notably, x/mod now includes the GOPRIVATE pattern-matching API we were copying before, so we can use it directly. Also bump the Go version requirement to 1.15, in preparation for the import path obfuscation PR, and don't let the gotip job fail the entire workflow.pull/117/head
Daniel Martí
5 years ago
parent
bd46c29380
commit
e1b827f09c
@ -1,9 +1,10 @@
|
||||
module mvdan.cc/garble
|
||||
|
||||
go 1.14
|
||||
go 1.15
|
||||
|
||||
require (
|
||||
github.com/google/go-cmp v0.5.1
|
||||
github.com/rogpeppe/go-internal v1.6.0
|
||||
golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa
|
||||
github.com/google/go-cmp v0.5.2
|
||||
github.com/rogpeppe/go-internal v1.6.1
|
||||
golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449
|
||||
golang.org/x/tools v0.0.0-20200828161849-5deb26317202
|
||||
)
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"path"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// All source code in this file is copied from the main Go repository, licensed
|
||||
// under the same license as this project, BSD-3-Clause.
|
||||
|
||||
func GlobsMatchPath(globs, target string) bool {
|
||||
for globs != "" {
|
||||
// Extract next non-empty glob in comma-separated list.
|
||||
var glob string
|
||||
if i := strings.Index(globs, ","); i >= 0 {
|
||||
glob, globs = globs[:i], globs[i+1:]
|
||||
} else {
|
||||
glob, globs = globs, ""
|
||||
}
|
||||
if glob == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
// A glob with N+1 path elements (N slashes) needs to be matched
|
||||
// against the first N+1 path elements of target,
|
||||
// which end just before the N+1'th slash.
|
||||
n := strings.Count(glob, "/")
|
||||
prefix := target
|
||||
// Walk target, counting slashes, truncating at the N+1'th slash.
|
||||
for i := 0; i < len(target); i++ {
|
||||
if target[i] == '/' {
|
||||
if n == 0 {
|
||||
prefix = target[:i]
|
||||
break
|
||||
}
|
||||
n--
|
||||
}
|
||||
}
|
||||
if n > 0 {
|
||||
// Not enough prefix elements.
|
||||
continue
|
||||
}
|
||||
matched, _ := path.Match(glob, prefix)
|
||||
if matched {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
Loading…
Reference in New Issue