Upgrade versions of vendored libs

vendor/github.com/cockroachdb/redact/internal/buffer/buffer.go

@@ -15,6 +15,7 @@
 package buffer
 
 import (
+	"bytes"
 	origFmt "fmt"
 	"unicode/utf8"
 	"unsafe"
@@ -197,11 +198,16 @@ func (b *Buffer) endRedactable() {
 	if len(b.buf) == 0 {
 		return
 	}
-	p, ok := b.tryGrowByReslice(len(m.EndS))
-	if !ok {
-		p = b.grow(len(m.EndS))
+	if bytes.HasSuffix(b.buf, m.StartBytes) {
+		// Special case: remove a trailing open marker and call it a day.
+		b.buf = b.buf[:len(b.buf)-m.StartLen]
+	} else {
+		p, ok := b.tryGrowByReslice(m.EndLen)
+		if !ok {
+			p = b.grow(m.EndLen)
+		}
+		copy(b.buf[p:], m.EndS)
 	}
-	copy(b.buf[p:], m.EndS)
 	b.markerOpen = false
 }
 
@@ -214,18 +220,23 @@ func (b *Buffer) startWrite() {
 
 // endRedactable adds the closing redaction marker.
 func (b *Buffer) startRedactable() {
-	p, ok := b.tryGrowByReslice(len(m.StartS))
-	if !ok {
-		p = b.grow(len(m.StartS))
+	if bytes.HasSuffix(b.buf, m.EndBytes) {
+		// Special case: remove a trailing closing marker and call it a day.
+		b.buf = b.buf[:len(b.buf)-m.EndLen]
+	} else {
+		p, ok := b.tryGrowByReslice(len(m.StartS))
+		if !ok {
+			p = b.grow(len(m.StartS))
+		}
+		copy(b.buf[p:], m.StartS)
 	}
-	copy(b.buf[p:], m.StartS)
 	b.markerOpen = true
 }
 
 // escapeToEnd escapes occurrences of redaction markers in
 // b.buf[b.validUntil:] and advances b.validUntil until the end.
 func (b *Buffer) escapeToEnd(breakNewLines bool) {
-	b.buf = escape.InternalEscapeBytes(b.buf, b.validUntil, breakNewLines, breakNewLines)
+	b.buf = escape.InternalEscapeBytes(b.buf, b.validUntil, breakNewLines, false /* trim */)
 	b.validUntil = len(b.buf)
 }
 
@@ -313,6 +324,13 @@ func (b *Buffer) Grow(n int) {
 	b.buf = b.buf[:m]
 }
 
+// clone is used in tests.
+func (b *Buffer) clone() *Buffer {
+	c := *b
+	c.buf = append([]byte(nil), b.buf...)
+	return &c
+}
+
 // makeSlice allocates a slice of size n. If the allocation fails, it panics
 // with ErrTooLarge.
 func makeSlice(n int) []byte {

vendor/github.com/cockroachdb/redact/internal/escape/escape.go

@@ -28,6 +28,9 @@ import (
 // If breakNewLines is set, a closing redaction marker
 // is placed before sequences of one or more newline characters,
 // and an open redaction marker is placed afterwards.
+//
+// If strip is set, final newlines and spaces are trimmed from the
+// output.
 func InternalEscapeBytes(b []byte, startLoc int, breakNewLines, strip bool) (res []byte) {
 	// Note: we use len(...RedactableS) and not len(...RedactableBytes)
 	// because the ...S variant is a compile-time constant so this
@@ -69,7 +72,12 @@ func InternalEscapeBytes(b []byte, startLoc int, breakNewLines, strip bool) (res
 				copied = true
 			}
 			res = append(res, b[k:i]...)
-			res = append(res, end...)
+			// Either add an end marker, or elide a start marker immediately prior.
+			if bytes.HasSuffix(res, start) {
+				res = res[:len(res)-ls]
+			} else {
+				res = append(res, end...)
+			}
 			// Advance to the last newline character. We want to forward
 			// them all in a single call to doWrite, for performance.
 			lastNewLine := i

vendor/github.com/cockroachdb/redact/internal/markers/constants.go

@@ -20,8 +20,10 @@ import "regexp"
 const (
 	Start       = '‹'
 	StartS      = string(Start)
+	StartLen    = len(StartS)
 	End         = '›'
 	EndS        = string(End)
+	EndLen      = len(EndS)
 	EscapeMark  = '?'
 	EscapeMarkS = string(EscapeMark)
 	RedactedS   = StartS + "×" + EndS