all: update to Go 1.18

Bump go.mod and README.

Switch to upstream net/netip.

Use strings.Cut.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder
2022-03-16 16:09:48 -07:00
parent ae6bc4dd64
commit 42c9af45e1
20 changed files with 23 additions and 33 deletions

View File

@@ -11,10 +11,9 @@ import (
"errors"
"math/bits"
"net"
"net/netip"
"sync"
"unsafe"
"golang.zx2c4.com/go118/netip"
)
type parentIndirection struct {

View File

@@ -8,10 +8,9 @@ package device
import (
"math/rand"
"net"
"net/netip"
"sort"
"testing"
"golang.zx2c4.com/go118/netip"
)
const (

View File

@@ -8,9 +8,8 @@ package device
import (
"math/rand"
"net"
"net/netip"
"testing"
"golang.zx2c4.com/go118/netip"
)
type testPairCommonBits struct {

View File

@@ -11,6 +11,7 @@ import (
"fmt"
"io"
"math/rand"
"net/netip"
"runtime"
"runtime/pprof"
"sync"
@@ -18,7 +19,6 @@ import (
"testing"
"time"
"golang.zx2c4.com/go118/netip"
"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/conn/bindtest"
"golang.zx2c4.com/wireguard/tun/tuntest"

View File

@@ -7,8 +7,7 @@ package device
import (
"math/rand"
"golang.zx2c4.com/go118/netip"
"net/netip"
)
type DummyEndpoint struct {

View File

@@ -12,13 +12,13 @@ import (
"fmt"
"io"
"net"
"net/netip"
"strconv"
"strings"
"sync"
"sync/atomic"
"time"
"golang.zx2c4.com/go118/netip"
"golang.zx2c4.com/wireguard/ipc"
)
@@ -161,12 +161,10 @@ func (device *Device) IpcSetOperation(r io.Reader) (err error) {
peer.handlePostConfig()
return nil
}
parts := strings.Split(line, "=")
if len(parts) != 2 {
return ipcErrorf(ipc.IpcErrorProtocol, "failed to parse line %q, found %d =-separated parts, want 2", line, len(parts))
key, value, ok := strings.Cut(line, "=")
if !ok {
return ipcErrorf(ipc.IpcErrorProtocol, "failed to parse line %q", line)
}
key := parts[0]
value := parts[1]
if key == "public_key" {
if deviceConfig {