Move "logger" package to under types, now that we have it.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>

wgengine/monitor/monitor.go

@@ -9,7 +9,7 @@ package monitor
 import (
 	"time"
 
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 // Message represents a message returned from a connection.

wgengine/router_bsd.go

@@ -15,7 +15,7 @@ import (
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
 	"github.com/tailscale/wireguard-go/wgcfg"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 // For now this router only supports the userspace WireGuard implementations.

wgengine/router_darwin.go

@@ -7,7 +7,7 @@ package wgengine
 import (
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 type darwinRouter struct {

wgengine/router_default.go

@@ -9,7 +9,7 @@ package wgengine
 import (
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 func NewUserspaceRouter(logf logger.Logf, tunname string, dev *device.Device, tuntap tun.Device, netChanged func()) Router {

wgengine/router_fake.go

@@ -7,7 +7,7 @@ package wgengine
 import (
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 type fakeRouter struct {

wgengine/router_linux.go

@@ -19,7 +19,7 @@ import (
 	"github.com/tailscale/wireguard-go/tun"
 	"github.com/tailscale/wireguard-go/wgcfg"
 	"tailscale.com/atomicfile"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 	"tailscale.com/wgengine/monitor"
 )
 

wgengine/router_windows.go

@@ -10,7 +10,7 @@ import (
 	winipcfg "github.com/tailscale/winipcfg-go"
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 type winRouter struct {

wgengine/rusage.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"runtime"
 
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 // RusagePrefixLog returns a Logf func wrapping the provided logf func that adds

wgengine/userspace.go

@@ -16,8 +16,8 @@ import (
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
 	"github.com/tailscale/wireguard-go/wgcfg"
-	"tailscale.com/logger"
 	"tailscale.com/tailcfg"
+	"tailscale.com/types/logger"
 	"tailscale.com/wgengine/filter"
 	"tailscale.com/wgengine/magicsock"
 	"tailscale.com/wgengine/packet"