Skip to content
This repository has been archived by the owner on Jan 2, 2024. It is now read-only.

Commit

Permalink
all: use slices mirror package
Browse files Browse the repository at this point in the history
This commit "vendors" and uses a copy of the slices package just before
changeing the SlicesFunc signature to require an int return vs a bool.

By vendoring, we avoid updating our code (for now) and requiring a
forced upgrade to go1.21 for anyone not yet ready for that.

Fixes #306
  • Loading branch information
bmizerany committed Aug 15, 2023
1 parent 78939e2 commit 559de5d
Show file tree
Hide file tree
Showing 23 changed files with 2,795 additions and 12 deletions.
2 changes: 1 addition & 1 deletion api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"strings"
"time"

"golang.org/x/exp/slices"
"tier.run/api/apitypes"
"tier.run/api/materialize"
"tier.run/client/tier"
"tier.run/control"
"tier.run/mirror/x/exp/slices"
"tier.run/refs"
"tier.run/stripe"
"tier.run/trweb"
Expand Down
2 changes: 1 addition & 1 deletion api/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"time"

"github.com/kr/pretty"
"golang.org/x/exp/slices"
"kr.dev/diff"
"tier.run/api/apitypes"
"tier.run/client/tier"
"tier.run/control"
"tier.run/mirror/x/exp/slices"
"tier.run/refs"
"tier.run/stripe"
"tier.run/stripe/stroke"
Expand Down
2 changes: 1 addition & 1 deletion api/materialize/views_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"testing"

"github.com/tailscale/hujson"
"golang.org/x/exp/slices"
"kr.dev/diff"
"tier.run/client/tier"
"tier.run/control"
"tier.run/mirror/x/exp/slices"
"tier.run/refs"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/tier/accounts.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"path/filepath"
"time"

"golang.org/x/exp/slices"
"tier.run/mirror/x/exp/slices"
"tier.run/stripe"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/tier/cline/cline.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"time"

"golang.org/x/exp/slices"
"tier.run/mirror/x/exp/slices"
)

var testTier string
Expand Down
2 changes: 1 addition & 1 deletion cmd/tier/tier.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (
"time"

"go4.org/types"
"golang.org/x/exp/slices"
"tier.run/api"
"tier.run/api/apitypes"
"tier.run/api/materialize"
"tier.run/client/tier"
"tier.run/control"
"tier.run/mirror/x/exp/slices"
"tier.run/profile"
"tier.run/stripe"
"tier.run/version"
Expand Down
2 changes: 1 addition & 1 deletion cmd/tier/tier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"testing"
"time"

"golang.org/x/exp/slices"
"kr.dev/diff"
"tier.run/cmd/tier/cline"
"tier.run/mirror/x/exp/slices"
"tier.run/profile"
"tier.run/stripe"
"tier.run/stripe/stroke"
Expand Down
2 changes: 1 addition & 1 deletion control/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"sync"
"testing"

"golang.org/x/exp/slices"
"kr.dev/diff"
"tier.run/mirror/x/exp/slices"
"tier.run/refs"
"tier.run/stripe/stroke"
)
Expand Down
2 changes: 1 addition & 1 deletion control/schedule.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"time"

"golang.org/x/exp/slices"
"kr.dev/errorfmt"
"tier.run/mirror/x/exp/slices"
"tier.run/refs"
"tier.run/stripe"
"tier.run/types/payment"
Expand Down
2 changes: 1 addition & 1 deletion control/schedule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (

"github.com/kr/pretty"
"github.com/tailscale/hujson"
"golang.org/x/exp/slices"
"golang.org/x/sync/errgroup"
"kr.dev/diff"
"kr.dev/errorfmt"
"tier.run/mirror/x/exp/slices"
"tier.run/refs"
"tier.run/stripe"
"tier.run/types/they"
Expand Down
3 changes: 3 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ require (
require (
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/kr/text v0.2.0 // indirect
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
golang.org/x/net v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
)

require (
Expand Down
5 changes: 5 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc=
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand Down Expand Up @@ -142,6 +143,8 @@ golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.3.0 h1:VWL6FNY2bEEmsGVKabSlHu5Irp34xmMRoqb/9lF9lxk=
golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -174,6 +177,8 @@ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fq
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
Expand Down
1 change: 1 addition & 0 deletions mirror/staticcheck.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
checks = ["-all"]
Loading

0 comments on commit 559de5d

Please sign in to comment.