Merge pull request #12525 from mheon/bump_343

Backports for and bump to v3.4.3

1 files changed, 0 insertions, 93 deletions

diff --git a/vendor/github.com/lunixbochs/vtclean/io.go b/vendor/github.com/lunixbochs/vtclean/io.go
deleted file mode 100644
index 31be0076a..000000000
--- a/vendor/github.com/lunixbochs/vtclean/io.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package vtclean
-
-import (
-	"bufio"
-	"bytes"
-	"io"
-)
-
-type reader struct {
-	io.Reader
-	scanner *bufio.Scanner
-	buf     []byte
-
-	color bool
-}
-
-func NewReader(r io.Reader, color bool) io.Reader {
-	return &reader{Reader: r, color: color}
-}
-
-func (r *reader) scan() bool {
-	if r.scanner == nil {
-		r.scanner = bufio.NewScanner(r.Reader)
-	}
-	if len(r.buf) > 0 {
-		return true
-	}
-	if r.scanner.Scan() {
-		r.buf = []byte(Clean(r.scanner.Text(), r.color) + "\n")
-		return true
-	}
-	return false
-}
-
-func (r *reader) fill(p []byte) int {
-	n := len(r.buf)
-	copy(p, r.buf)
-	if len(p) < len(r.buf) {
-		r.buf = r.buf[len(p):]
-		n = len(p)
-	} else {
-		r.buf = nil
-	}
-	return n
-}
-
-func (r *reader) Read(p []byte) (int, error) {
-	n := r.fill(p)
-	if n < len(p) {
-		if !r.scan() {
-			if n == 0 {
-				return 0, io.EOF
-			}
-			return n, nil
-		}
-		n += r.fill(p[n:])
-	}
-	return n, nil
-}
-
-type writer struct {
-	io.Writer
-	buf   []byte
-	color bool
-}
-
-func NewWriter(w io.Writer, color bool) io.WriteCloser {
-	return &writer{Writer: w, color: color}
-}
-
-func (w *writer) Write(p []byte) (int, error) {
-	buf := append(w.buf, p...)
-	lines := bytes.Split(buf, []byte("\n"))
-	if len(lines) > 0 {
-		last := len(lines) - 1
-		w.buf = lines[last]
-		count := 0
-		for _, line := range lines[:last] {
-			n, err := w.Writer.Write([]byte(Clean(string(line), w.color) + "\n"))
-			count += n
-			if err != nil {
-				return count, err
-			}
-		}
-	}
-	return len(p), nil
-}
-
-func (w *writer) Close() error {
-	cl := Clean(string(w.buf), w.color)
-	_, err := w.Writer.Write([]byte(cl))
-	return err
-}