Skip to content

Commit b6a87ba

Browse files
authored
Merge pull request #6529 from oasisprotocol/peternose/trivial/migrate-to-slices
go: Replace golang.org/x/exp/slices with slices
2 parents 2b48a64 + 5fb0872 commit b6a87ba

6 files changed

Lines changed: 84 additions & 57 deletions

File tree

.buildkite/go/build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ pushd go
3030
popd
3131

3232
pushd tests/upgrade
33-
# Use legacy Go toolchain for pre-upgrade tests.
34-
OASIS_GO=go1.20.2 make -C pre
35-
# Use regular Go toolchain for post-upgrade tests.
33+
make -C pre
3634
make -C post
3735
popd

.changelog/6529.trivial.md

Whitespace-only changes.

go/runtime/history/history_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"context"
55
"fmt"
66
"os"
7+
"slices"
78
"testing"
89
"time"
910

1011
"github.com/stretchr/testify/require"
11-
"golang.org/x/exp/slices"
1212

1313
"github.com/oasisprotocol/oasis-core/go/common"
1414
roothash "github.com/oasisprotocol/oasis-core/go/roothash/api"

tests/upgrade/pre/go.mod

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/oasisprotocol/oasis-core/test-upgrade
22

3-
go 1.19
3+
go 1.26.0
44

55
replace (
66
// Updates the version used by badgerdb, because some of the Go
@@ -24,7 +24,6 @@ require (
2424
github.com/oasisprotocol/oasis-core/go v0.2202.12-0.20230814124622-de57b1395983
2525
github.com/spf13/pflag v1.0.5
2626
github.com/spf13/viper v1.15.0
27-
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
2827
)
2928

3029
require (
@@ -74,14 +73,14 @@ require (
7473
github.com/google/flatbuffers v1.12.1 // indirect
7574
github.com/google/gopacket v1.1.19 // indirect
7675
github.com/google/orderedcode v0.0.1 // indirect
77-
github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
76+
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
7877
github.com/google/uuid v1.3.0 // indirect
7978
github.com/gorilla/websocket v1.5.0 // indirect
8079
github.com/gtank/merlin v0.1.1 // indirect
8180
github.com/hashicorp/errwrap v1.1.0 // indirect
8281
github.com/hashicorp/go-hclog v1.4.0 // indirect
8382
github.com/hashicorp/go-plugin v1.4.6 // indirect
84-
github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
83+
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
8584
github.com/hashicorp/hcl v1.0.0 // indirect
8685
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
8786
github.com/hpcloud/tail v1.0.0 // indirect
@@ -102,13 +101,13 @@ require (
102101
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
103102
github.com/libp2p/go-cidranger v1.1.0 // indirect
104103
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
105-
github.com/libp2p/go-libp2p v0.29.2 // indirect
104+
github.com/libp2p/go-libp2p v0.31.1 // indirect
106105
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
107106
github.com/libp2p/go-libp2p-pubsub v0.9.3 // indirect
108107
github.com/libp2p/go-msgio v0.3.0 // indirect
109108
github.com/libp2p/go-nat v0.2.0 // indirect
110109
github.com/libp2p/go-netroute v0.2.1 // indirect
111-
github.com/libp2p/go-reuseport v0.3.0 // indirect
110+
github.com/libp2p/go-reuseport v0.4.0 // indirect
112111
github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
113112
github.com/magiconair/properties v1.8.7 // indirect
114113
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
@@ -128,7 +127,7 @@ require (
128127
github.com/mr-tron/base58 v1.2.0 // indirect
129128
github.com/multiformats/go-base32 v0.1.0 // indirect
130129
github.com/multiformats/go-base36 v0.2.0 // indirect
131-
github.com/multiformats/go-multiaddr v0.10.1 // indirect
130+
github.com/multiformats/go-multiaddr v0.11.0 // indirect
132131
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
133132
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
134133
github.com/multiformats/go-multibase v0.2.0 // indirect
@@ -140,7 +139,7 @@ require (
140139
github.com/oasisprotocol/safeopen v0.0.0-20200528085122-e01cfdfc7661 // indirect
141140
github.com/oklog/run v1.0.0 // indirect
142141
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
143-
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
142+
github.com/opencontainers/runtime-spec v1.1.0 // indirect
144143
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
145144
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
146145
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
@@ -151,9 +150,8 @@ require (
151150
github.com/prometheus/common v0.42.0 // indirect
152151
github.com/prometheus/procfs v0.8.0 // indirect
153152
github.com/quic-go/qpack v0.4.0 // indirect
154-
github.com/quic-go/qtls-go1-19 v0.3.3 // indirect
155-
github.com/quic-go/qtls-go1-20 v0.2.3 // indirect
156-
github.com/quic-go/quic-go v0.36.4 // indirect
153+
github.com/quic-go/qtls-go1-20 v0.3.3 // indirect
154+
github.com/quic-go/quic-go v0.38.2 // indirect
157155
github.com/quic-go/webtransport-go v0.5.3 // indirect
158156
github.com/raulk/go-watchdog v1.3.0 // indirect
159157
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
@@ -174,18 +172,18 @@ require (
174172
github.com/x448/float16 v0.8.4 // indirect
175173
go.etcd.io/bbolt v1.3.6 // indirect
176174
go.opencensus.io v0.24.0 // indirect
177-
go.uber.org/atomic v1.11.0 // indirect
178175
go.uber.org/dig v1.17.0 // indirect
179176
go.uber.org/fx v1.20.0 // indirect
180177
go.uber.org/multierr v1.11.0 // indirect
181-
go.uber.org/zap v1.24.0 // indirect
182-
golang.org/x/crypto v0.11.0 // indirect
178+
go.uber.org/zap v1.25.0 // indirect
179+
golang.org/x/crypto v0.12.0 // indirect
180+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
183181
golang.org/x/mod v0.12.0 // indirect
184-
golang.org/x/net v0.13.0 // indirect
182+
golang.org/x/net v0.14.0 // indirect
185183
golang.org/x/sync v0.3.0 // indirect
186-
golang.org/x/sys v0.10.0 // indirect
187-
golang.org/x/text v0.11.0 // indirect
188-
golang.org/x/tools v0.11.0 // indirect
184+
golang.org/x/sys v0.11.0 // indirect
185+
golang.org/x/text v0.12.0 // indirect
186+
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
189187
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
190188
google.golang.org/grpc v1.53.0 // indirect
191189
google.golang.org/grpc/security/advancedtls v0.0.0-20221004221323-12db695f1648 // indirect

0 commit comments

Comments
 (0)