vendor: Mega update all dependencies

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4080

vendor/github.com/onsi/ginkgo/internal/spec/specs.go

@@ -7,15 +7,14 @@ import (
 )
 
 type Specs struct {
-	specs                 []*Spec
-	numberOfOriginalSpecs int
-	hasProgrammaticFocus  bool
+	specs                []*Spec
+	hasProgrammaticFocus bool
+	RegexScansFilePath   bool
 }
 
 func NewSpecs(specs []*Spec) *Specs {
 	return &Specs{
 		specs: specs,
-		numberOfOriginalSpecs: len(specs),
 	}
 }
 
@@ -23,10 +22,6 @@ func (e *Specs) Specs() []*Spec {
 	return e.specs
 }
 
-func (e *Specs) NumberOfOriginalSpecs() int {
-	return e.numberOfOriginalSpecs
-}
-
 func (e *Specs) HasProgrammaticFocus() bool {
 	return e.hasProgrammaticFocus
 }
@@ -45,7 +40,7 @@ func (e *Specs) ApplyFocus(description string, focusString string, skipString st
 	if focusString == "" && skipString == "" {
 		e.applyProgrammaticFocus()
 	} else {
-		e.applyRegExpFocus(description, focusString, skipString)
+		e.applyRegExpFocusAndSkip(description, focusString, skipString)
 	}
 }
 
@@ -67,12 +62,27 @@ func (e *Specs) applyProgrammaticFocus() {
 	}
 }
 
-func (e *Specs) applyRegExpFocus(description string, focusString string, skipString string) {
+// toMatch returns a byte[] to be used by regex matchers.  When adding new behaviours to the matching function,
+// this is the place which we append to.
+func (e *Specs) toMatch(description string, spec *Spec) []byte {
+	if e.RegexScansFilePath {
+		return []byte(
+			description + " " +
+				spec.ConcatenatedString() + " " +
+				spec.subject.CodeLocation().FileName)
+	} else {
+		return []byte(
+			description + " " +
+				spec.ConcatenatedString())
+	}
+}
+
+func (e *Specs) applyRegExpFocusAndSkip(description string, focusString string, skipString string) {
 	for _, spec := range e.specs {
 		matchesFocus := true
 		matchesSkip := false
 
-		toMatch := []byte(description + " " + spec.ConcatenatedString())
+		toMatch := e.toMatch(description, spec)
 
 		if focusString != "" {
 			focusFilter := regexp.MustCompile(focusString)
@@ -98,15 +108,6 @@ func (e *Specs) SkipMeasurements() {
 	}
 }
 
-func (e *Specs) TrimForParallelization(total int, node int) {
-	startIndex, count := ParallelizedIndexRange(len(e.specs), total, node)
-	if count == 0 {
-		e.specs = make([]*Spec, 0)
-	} else {
-		e.specs = e.specs[startIndex : startIndex+count]
-	}
-}
-
 //sort.Interface
 
 func (e *Specs) Len() int {