From 70a840d3d5c4b107f6dc24e57ec7b50c9320b318 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Thu, 19 Aug 2021 21:05:28 +0200 Subject: [PATCH] lib/connections: Remove future go build constraints on quic (#7898) --- lib/connections/quic_dial.go | 4 ++-- lib/connections/quic_listen.go | 4 ++-- lib/connections/quic_misc.go | 4 ++-- lib/connections/quic_unsupported.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/connections/quic_dial.go b/lib/connections/quic_dial.go index ae55eef0f..58eb1ff60 100644 --- a/lib/connections/quic_dial.go +++ b/lib/connections/quic_dial.go @@ -4,8 +4,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. -//go:build go1.14 && !noquic && !go1.17 -// +build go1.14,!noquic,!go1.17 +//go:build go1.15 && !noquic +// +build go1.15,!noquic package connections diff --git a/lib/connections/quic_listen.go b/lib/connections/quic_listen.go index ea9d9e006..4e5091f80 100644 --- a/lib/connections/quic_listen.go +++ b/lib/connections/quic_listen.go @@ -4,8 +4,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at http://mozilla.org/MPL/2.0/. -//go:build go1.14 && !noquic && !go1.17 -// +build go1.14,!noquic,!go1.17 +//go:build go1.15 && !noquic +// +build go1.15,!noquic package connections diff --git a/lib/connections/quic_misc.go b/lib/connections/quic_misc.go index d0b287260..5014dd259 100644 --- a/lib/connections/quic_misc.go +++ b/lib/connections/quic_misc.go @@ -4,8 +4,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at http://mozilla.org/MPL/2.0/. -//go:build go1.14 && !noquic && !go1.17 -// +build go1.14,!noquic,!go1.17 +//go:build go1.15 && !noquic +// +build go1.15,!noquic package connections diff --git a/lib/connections/quic_unsupported.go b/lib/connections/quic_unsupported.go index 8f91c9434..5df38a19b 100644 --- a/lib/connections/quic_unsupported.go +++ b/lib/connections/quic_unsupported.go @@ -4,8 +4,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at http://mozilla.org/MPL/2.0/. -//go:build noquic || !go1.14 || go1.17 -// +build noquic !go1.14 go1.17 +//go:build noquic || !go1.15 +// +build noquic !go1.15 package connections