From df26370d220274c97163618527e89eccaa0196be Mon Sep 17 00:00:00 2001 From: Rob Findley Date: Tue, 27 May 2025 17:09:50 +0000 Subject: [PATCH] internal/jsonrpc2_v2: update for go1.16+ Change-Id: If70bb4b7ab236ae921ff23d123cb38d476cfa665 Reviewed-on: https://go-review.googlesource.com/c/tools/+/676516 Auto-Submit: Robert Findley Reviewed-by: Alan Donovan LUCI-TryBot-Result: Go LUCI --- internal/jsonrpc2/net.go | 6 +++--- internal/jsonrpc2/serve_go116.go | 13 ------------- internal/jsonrpc2/serve_pre116.go | 15 --------------- 3 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 internal/jsonrpc2/serve_go116.go delete mode 100644 internal/jsonrpc2/serve_pre116.go diff --git a/internal/jsonrpc2/net.go b/internal/jsonrpc2/net.go index 3c246b1..05db062 100644 --- a/internal/jsonrpc2/net.go +++ b/internal/jsonrpc2/net.go @@ -100,14 +100,14 @@ func (l *netPiper) Accept(context.Context) (io.ReadWriteCloser, error) { // preferring the latter if already closed at the start of Accept. select { case <-l.done: - return nil, errClosed + return nil, net.ErrClosed default: } select { case rwc := <-l.dialed: return rwc, nil case <-l.done: - return nil, errClosed + return nil, net.ErrClosed } } @@ -133,6 +133,6 @@ func (l *netPiper) Dial(ctx context.Context) (io.ReadWriteCloser, error) { case <-l.done: client.Close() server.Close() - return nil, errClosed + return nil, net.ErrClosed } } diff --git a/internal/jsonrpc2/serve_go116.go b/internal/jsonrpc2/serve_go116.go deleted file mode 100644 index 9158bc5..0000000 --- a/internal/jsonrpc2/serve_go116.go +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2022 The Go MCP SDK Authors. All rights reserved. -// Use of this source code is governed by an MIT-style -// license that can be found in the LICENSE file. - -//go:build go1.16 - -package jsonrpc2 - -import ( - "net" -) - -var errClosed = net.ErrClosed diff --git a/internal/jsonrpc2/serve_pre116.go b/internal/jsonrpc2/serve_pre116.go deleted file mode 100644 index f623aea..0000000 --- a/internal/jsonrpc2/serve_pre116.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2020 The Go MCP SDK Authors. All rights reserved. -// Use of this source code is governed by an MIT-style -// license that can be found in the LICENSE file. - -//go:build !go1.16 - -package jsonrpc2 - -import ( - "errors" -) - -// errClosed is an error with the same string as net.ErrClosed, -// which was added in Go 1.16. -var errClosed = errors.New("use of closed network connection")