diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2021-02-09 15:39:19 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-02-09 15:39:19 +0100 |
| commit | eaf664e4e9134ab7d5100d7284274a821122fbbc (patch) | |
| tree | 561a3c570d96016f71714501f68605e787151960 | |
| parent | device: fix comment typo and shorten state.mu.Lock to state.Lock (diff) | |
| download | wireguard-go-eaf664e4e9134ab7d5100d7284274a821122fbbc.tar.xz wireguard-go-eaf664e4e9134ab7d5100d7284274a821122fbbc.zip | |
device: remove deviceStateNew
It's never used and we won't have a use for it. Also, move to go-running
stringer, for those without GOPATHs.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | device/device.go | 14 | ||||
| -rw-r--r-- | device/devicestate_string.go | 14 | ||||
| -rw-r--r-- | go.sum | 1 |
3 files changed, 9 insertions, 20 deletions
diff --git a/device/device.go b/device/device.go index 0417397..1641c3b 100644 --- a/device/device.go +++ b/device/device.go @@ -91,20 +91,18 @@ type Device struct { } // deviceState represents the state of a Device. -// There are four states: new, down, up, closed. -// However, state new should never be observable. +// There are three states: down, up, closed. // Transitions: // -// new -> down -----+ -// ↑↓ ↓ -// up -> closed +// down -----+ +// ↑↓ ↓ +// up -> closed // type deviceState uint32 -//go:generate stringer -type deviceState -trimprefix=deviceState +//go:generate go run golang.org/x/tools/cmd/stringer -type deviceState -trimprefix=deviceState const ( - deviceStateNew deviceState = iota - deviceStateDown + deviceStateDown deviceState = iota deviceStateUp deviceStateClosed ) diff --git a/device/devicestate_string.go b/device/devicestate_string.go index e8f16b0..6577dd4 100644 --- a/device/devicestate_string.go +++ b/device/devicestate_string.go @@ -4,19 +4,9 @@ package device import "strconv" -func _() { - // An "invalid array index" compiler error signifies that the constant values have changed. - // Re-run the stringer command to generate them again. - var x [1]struct{} - _ = x[deviceStateNew-0] - _ = x[deviceStateDown-1] - _ = x[deviceStateUp-2] - _ = x[deviceStateClosed-3] -} - -const _deviceState_name = "NewDownUpClosed" +const _deviceState_name = "DownUpClosed" -var _deviceState_index = [...]uint8{0, 3, 7, 9, 15} +var _deviceState_index = [...]uint8{0, 4, 6, 12} func (i deviceState) String() string { if i >= deviceState(len(_deviceState_index)-1) { @@ -13,4 +13,5 @@ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXR golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= |