mirror of https://github.com/tailscale/tailscale/
all: update to Go 1.20, use strings.CutPrefix/Suffix instead of our fork
Updates #7123 Updates #5309 Change-Id: I90bcd87a2fb85a91834a0dd4be6e03db08438672 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>pull/7155/head
Brad Fitzpatrick
1 year ago
committed by
Brad Fitzpatrick
parent
623176ebc9
commit
b1248442c3
@ -1,10 +1,10 @@
|
||||
// Copyright (c) Tailscale Inc & AUTHORS
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
|
||||
//go:build !go1.19
|
||||
//go:build !go1.20
|
||||
|
||||
package tailscale
|
||||
|
||||
func init() {
|
||||
you_need_Go_1_19_to_compile_Tailscale()
|
||||
you_need_Go_1_20_to_compile_Tailscale()
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
// Copyright (c) Tailscale Inc & AUTHORS
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
|
||||
//go:build !go1.19
|
||||
//go:build !go1.20
|
||||
|
||||
package main
|
||||
|
||||
func init() {
|
||||
you_need_Go_1_19_to_compile_Tailscale()
|
||||
you_need_Go_1_20_to_compile_Tailscale()
|
||||
}
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
// Copyright (c) Tailscale Inc & AUTHORS
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
|
||||
// Package strs contains string-related utility funcs.
|
||||
package strs
|
||||
|
||||
import "strings"
|
||||
|
||||
// CutPrefix returns s without the provided leading prefix string
|
||||
// and reports whether it found the prefix.
|
||||
// If s doesn't start with prefix, CutPrefix returns s, false.
|
||||
// If prefix is the empty string, CutPrefix returns s, true.
|
||||
//
|
||||
// TODO: remove this once Go 1.20 is out with it.
|
||||
// See https://github.com/tailscale/tailscale/issues/5309
|
||||
func CutPrefix(s, prefix string) (after string, found bool) {
|
||||
if !strings.HasPrefix(s, prefix) {
|
||||
return s, false
|
||||
}
|
||||
return s[len(prefix):], true
|
||||
}
|
||||
|
||||
// CutSuffix returns s without the provided ending suffix string
|
||||
// and reports whether it found the suffix.
|
||||
// If s doesn't end with suffix, CutSuffix returns s, false.
|
||||
// If suffix is the empty string, CutSuffix returns s, true.
|
||||
//
|
||||
// See https://github.com/tailscale/tailscale/issues/5309
|
||||
// TODO: remove this once Go 1.20 is out with it.
|
||||
func CutSuffix(s, suffix string) (before string, found bool) {
|
||||
if !strings.HasSuffix(s, suffix) {
|
||||
return s, false
|
||||
}
|
||||
return s[:len(s)-len(suffix)], true
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
// Copyright (c) Tailscale Inc & AUTHORS
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
|
||||
package strs
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestCut(t *testing.T) {
|
||||
tests := []struct {
|
||||
fn func(string, string) (string, bool)
|
||||
in1, in2 string
|
||||
want string
|
||||
wantOK bool
|
||||
}{
|
||||
{CutPrefix, "foo", "fo", "o", true},
|
||||
{CutPrefix, "bar", "fo", "bar", false},
|
||||
{CutSuffix, "foo", "o", "fo", true},
|
||||
{CutSuffix, "bar", "fo", "bar", false},
|
||||
}
|
||||
for i, tt := range tests {
|
||||
got, gotOK := tt.fn(tt.in1, tt.in2)
|
||||
if got != tt.want {
|
||||
t.Errorf("%d. got %q; want %q", i, got, tt.want)
|
||||
}
|
||||
if gotOK != tt.wantOK {
|
||||
t.Errorf("%d. got %v; want %v", i, gotOK, tt.wantOK)
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue