From 99d8597e59aa237164d072ce4ba28cf55e7213df Mon Sep 17 00:00:00 2001 From: Artyom Pervukhin Date: Wed, 13 Dec 2017 12:00:10 +0300 Subject: [PATCH] Replace d.Sub(time.Now()) with time.Until(d) --- session.go | 2 +- stream.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/session.go b/session.go index 12fc4cb..23671da 100644 --- a/session.go +++ b/session.go @@ -118,7 +118,7 @@ func (s *Session) OpenStream() (*Stream, error) { func (s *Session) AcceptStream() (*Stream, error) { var deadline <-chan time.Time if d, ok := s.deadline.Load().(time.Time); ok && !d.IsZero() { - timer := time.NewTimer(d.Sub(time.Now())) + timer := time.NewTimer(time.Until(d)) defer timer.Stop() deadline = timer.C } diff --git a/stream.go b/stream.go index 613bd63..1b3ebe0 100644 --- a/stream.go +++ b/stream.go @@ -46,7 +46,7 @@ func (s *Stream) ID() uint32 { func (s *Stream) Read(b []byte) (n int, err error) { var deadline <-chan time.Time if d, ok := s.readDeadline.Load().(time.Time); ok && !d.IsZero() { - timer := time.NewTimer(d.Sub(time.Now())) + timer := time.NewTimer(time.Until(d)) defer timer.Stop() deadline = timer.C } @@ -78,7 +78,7 @@ READ: func (s *Stream) Write(b []byte) (n int, err error) { var deadline <-chan time.Time if d, ok := s.writeDeadline.Load().(time.Time); ok && !d.IsZero() { - timer := time.NewTimer(d.Sub(time.Now())) + timer := time.NewTimer(time.Until(d)) defer timer.Stop() deadline = timer.C }