1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-02 15:34:36 +00:00

go mod and vendor changes

This commit is contained in:
rajashree
2020-02-18 11:17:29 -08:00
parent 4e38cdf825
commit 7e603d411a
404 changed files with 55774 additions and 53750 deletions

View File

@@ -90,7 +90,7 @@ func (opts formatOptions) FormatDiffSlice(v *valueNode) textNode {
}
if r == '\n' {
if maxLineLen < i-lastLineIdx {
lastLineIdx = i - lastLineIdx
maxLineLen = i - lastLineIdx
}
lastLineIdx = i + 1
numLines++
@@ -322,7 +322,7 @@ func coalesceInterveningIdentical(groups []diffStats, windowSize int) []diffStat
hadX, hadY := prev.NumRemoved > 0, prev.NumInserted > 0
hasX, hasY := next.NumRemoved > 0, next.NumInserted > 0
if ((hadX || hasX) && (hadY || hasY)) && curr.NumIdentical <= windowSize {
*prev = (*prev).Append(*curr).Append(*next)
*prev = prev.Append(*curr).Append(*next)
groups = groups[:len(groups)-1] // Truncate off equal group
continue
}