Skip to content

Commit 5fb9417

Browse files
adamdecafgaryburd
authored andcommitted
drop Go versions prior to 1.7 in CI
* drop Go versions prior to 1.7 in CI * consolidate conn*.go files after dropping old Go support
1 parent 3ff3320 commit 5fb9417

File tree

4 files changed

+9
-42
lines changed

4 files changed

+9
-42
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ sudo: false
33

44
matrix:
55
include:
6-
- go: 1.4
7-
- go: 1.5.x
8-
- go: 1.6.x
96
- go: 1.7.x
107
- go: 1.8.x
118
- go: 1.9.x

conn.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,15 @@ func (c *Conn) writeFatal(err error) error {
370370
return err
371371
}
372372

373+
func (c *Conn) read(n int) ([]byte, error) {
374+
p, err := c.br.Peek(n)
375+
if err == io.EOF {
376+
err = errUnexpectedEOF
377+
}
378+
c.br.Discard(len(p))
379+
return p, err
380+
}
381+
373382
func (c *Conn) write(frameType int, deadline time.Time, buf0, buf1 []byte) error {
374383
<-c.mu
375384
defer func() { c.mu <- true }()

conn_read.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

conn_read_legacy.go

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)