diff --git a/agent/agent.go b/agent/agent.go index 40e5de7356..c42bf3a815 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -14,6 +14,7 @@ import ( "os" "os/user" "path/filepath" + "slices" "sort" "strconv" "strings" @@ -26,7 +27,6 @@ import ( "github.com/prometheus/common/expfmt" "github.com/spf13/afero" "go.uber.org/atomic" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "golang.org/x/xerrors" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/agent/agent_test.go b/agent/agent_test.go index 8466c4e096..44112b6524 100644 --- a/agent/agent_test.go +++ b/agent/agent_test.go @@ -19,6 +19,7 @@ import ( "path/filepath" "regexp" "runtime" + "slices" "strconv" "strings" "sync/atomic" @@ -41,7 +42,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/crypto/ssh" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "cdr.dev/slog" diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go index b1a1f32baf..816bdf5555 100644 --- a/agent/agentssh/agentssh.go +++ b/agent/agentssh/agentssh.go @@ -12,6 +12,7 @@ import ( "os/user" "path/filepath" "runtime" + "slices" "strings" "sync" "time" @@ -24,7 +25,6 @@ import ( "github.com/spf13/afero" "go.uber.org/atomic" gossh "golang.org/x/crypto/ssh" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "cdr.dev/slog" diff --git a/agent/agenttest/client.go b/agent/agenttest/client.go index b5fa6ea8c2..a1d14e32a2 100644 --- a/agent/agenttest/client.go +++ b/agent/agenttest/client.go @@ -3,6 +3,7 @@ package agenttest import ( "context" "io" + "slices" "sync" "sync/atomic" "testing" @@ -12,7 +13,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/exp/maps" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/emptypb" diff --git a/agent/reconnectingpty/buffered.go b/agent/reconnectingpty/buffered.go index 6f314333a7..fb3c9907f4 100644 --- a/agent/reconnectingpty/buffered.go +++ b/agent/reconnectingpty/buffered.go @@ -5,11 +5,11 @@ import ( "errors" "io" "net" + "slices" "time" "github.com/armon/circbuf" "github.com/prometheus/client_golang/prometheus" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "cdr.dev/slog" diff --git a/cli/configssh.go b/cli/configssh.go index a7aed33eba..b3c29f711b 100644 --- a/cli/configssh.go +++ b/cli/configssh.go @@ -11,6 +11,7 @@ import ( "os" "path/filepath" "runtime" + "slices" "strconv" "strings" @@ -19,7 +20,6 @@ import ( "github.com/pkg/diff" "github.com/pkg/diff/write" "golang.org/x/exp/constraints" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "github.com/coder/coder/v2/cli/cliui" diff --git a/cli/create.go b/cli/create.go index f3709314cd..bb2e8dde02 100644 --- a/cli/create.go +++ b/cli/create.go @@ -4,11 +4,11 @@ import ( "context" "fmt" "io" + "slices" "strings" "time" "github.com/google/uuid" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "github.com/coder/pretty" diff --git a/cli/exp_scaletest.go b/cli/exp_scaletest.go index a7bd0f396b..a844a7e8c6 100644 --- a/cli/exp_scaletest.go +++ b/cli/exp_scaletest.go @@ -12,6 +12,7 @@ import ( "net/url" "os" "os/signal" + "slices" "strconv" "strings" "sync" @@ -21,7 +22,6 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "go.opentelemetry.io/otel/trace" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "cdr.dev/slog" diff --git a/cli/root.go b/cli/root.go index 09044ad3e2..816d7b769e 100644 --- a/cli/root.go +++ b/cli/root.go @@ -17,6 +17,7 @@ import ( "path/filepath" "runtime" "runtime/trace" + "slices" "strings" "sync" "syscall" @@ -25,7 +26,6 @@ import ( "github.com/mattn/go-isatty" "github.com/mitchellh/go-wordwrap" - "golang.org/x/exp/slices" "golang.org/x/mod/semver" "golang.org/x/xerrors" diff --git a/cli/tokens.go b/cli/tokens.go index d132547576..7873882e3a 100644 --- a/cli/tokens.go +++ b/cli/tokens.go @@ -3,10 +3,10 @@ package cli import ( "fmt" "os" + "slices" "strings" "time" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "github.com/coder/coder/v2/cli/cliui" diff --git a/coderd/agentapi/lifecycle.go b/coderd/agentapi/lifecycle.go index 5dd5e7b0c1..6bb3fedc51 100644 --- a/coderd/agentapi/lifecycle.go +++ b/coderd/agentapi/lifecycle.go @@ -3,10 +3,10 @@ package agentapi import ( "context" "database/sql" + "slices" "time" "github.com/google/uuid" - "golang.org/x/exp/slices" "golang.org/x/mod/semver" "golang.org/x/xerrors" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/coderd/audit/audit.go b/coderd/audit/audit.go index 097b0c6f49..a965c27a00 100644 --- a/coderd/audit/audit.go +++ b/coderd/audit/audit.go @@ -2,11 +2,11 @@ package audit import ( "context" + "slices" "sync" "testing" "github.com/google/uuid" - "golang.org/x/exp/slices" "github.com/coder/coder/v2/coderd/database" ) diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go index 2249e0c9f3..53cd272b32 100644 --- a/coderd/database/db2sdk/db2sdk.go +++ b/coderd/database/db2sdk/db2sdk.go @@ -5,13 +5,13 @@ import ( "encoding/json" "fmt" "net/url" + "slices" "sort" "strconv" "strings" "time" "github.com/google/uuid" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "tailscale.com/tailcfg" diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go index a39ba8d417..b09c629959 100644 --- a/coderd/database/dbauthz/dbauthz.go +++ b/coderd/database/dbauthz/dbauthz.go @@ -5,13 +5,13 @@ import ( "database/sql" "encoding/json" "errors" + "slices" "strings" "sync/atomic" "testing" "time" "github.com/google/uuid" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "github.com/open-policy-agent/opa/topdown" diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go index cc559a7e77..125cca81e1 100644 --- a/coderd/database/dbmem/dbmem.go +++ b/coderd/database/dbmem/dbmem.go @@ -10,6 +10,7 @@ import ( "math" "reflect" "regexp" + "slices" "sort" "strings" "sync" @@ -19,7 +20,6 @@ import ( "github.com/lib/pq" "golang.org/x/exp/constraints" "golang.org/x/exp/maps" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd/notifications/types" diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go index b0309f9f2e..fbf4a3cae6 100644 --- a/coderd/database/dbmetrics/dbmetrics.go +++ b/coderd/database/dbmetrics/dbmetrics.go @@ -2,11 +2,11 @@ package dbmetrics import ( "context" + "slices" "strconv" "time" "github.com/prometheus/client_golang/prometheus" - "golang.org/x/exp/slices" "cdr.dev/slog" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go index d05ec5f5ac..3855db4382 100644 --- a/coderd/database/dbmetrics/querymetrics.go +++ b/coderd/database/dbmetrics/querymetrics.go @@ -5,11 +5,11 @@ package dbmetrics import ( "context" + "slices" "time" "github.com/google/uuid" "github.com/prometheus/client_golang/prometheus" - "golang.org/x/exp/slices" "cdr.dev/slog" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/database/dbpurge/dbpurge_test.go b/coderd/database/dbpurge/dbpurge_test.go index 3b21b1076c..2422bcc91d 100644 --- a/coderd/database/dbpurge/dbpurge_test.go +++ b/coderd/database/dbpurge/dbpurge_test.go @@ -7,6 +7,7 @@ import ( "database/sql" "encoding/json" "fmt" + "slices" "testing" "time" @@ -14,7 +15,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" - "golang.org/x/exp/slices" "cdr.dev/slog" "cdr.dev/slog/sloggers/slogtest" diff --git a/coderd/database/gentest/modelqueries_test.go b/coderd/database/gentest/modelqueries_test.go index 52a99b5440..1025aaf324 100644 --- a/coderd/database/gentest/modelqueries_test.go +++ b/coderd/database/gentest/modelqueries_test.go @@ -5,11 +5,11 @@ import ( "go/ast" "go/parser" "go/token" + "slices" "testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" ) // TestCustomQueriesSynced makes sure the manual custom queries in modelqueries.go diff --git a/coderd/database/migrations/migrate_test.go b/coderd/database/migrations/migrate_test.go index bd347af0be..62e301a422 100644 --- a/coderd/database/migrations/migrate_test.go +++ b/coderd/database/migrations/migrate_test.go @@ -6,6 +6,7 @@ import ( "fmt" "os" "path/filepath" + "slices" "sync" "testing" @@ -17,7 +18,6 @@ import ( "github.com/lib/pq" "github.com/stretchr/testify/require" "go.uber.org/goleak" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "github.com/coder/coder/v2/coderd/database/dbtestutil" diff --git a/coderd/debug.go b/coderd/debug.go index a34e211ef0..0ae62282a2 100644 --- a/coderd/debug.go +++ b/coderd/debug.go @@ -7,10 +7,10 @@ import ( "encoding/json" "fmt" "net/http" + "slices" "time" "github.com/google/uuid" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "cdr.dev/slog" diff --git a/coderd/devtunnel/servers.go b/coderd/devtunnel/servers.go index 498ba74e42..79be97db87 100644 --- a/coderd/devtunnel/servers.go +++ b/coderd/devtunnel/servers.go @@ -2,11 +2,11 @@ package devtunnel import ( "runtime" + "slices" "sync" "time" ping "github.com/prometheus-community/pro-bing" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "golang.org/x/xerrors" diff --git a/coderd/entitlements/entitlements.go b/coderd/entitlements/entitlements.go index e141a861a9..6bbe32ade4 100644 --- a/coderd/entitlements/entitlements.go +++ b/coderd/entitlements/entitlements.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" "net/http" + "slices" "sync" "time" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "github.com/coder/coder/v2/codersdk" diff --git a/coderd/healthcheck/database.go b/coderd/healthcheck/database.go index 275124c5b1..97b4783231 100644 --- a/coderd/healthcheck/database.go +++ b/coderd/healthcheck/database.go @@ -2,10 +2,9 @@ package healthcheck import ( "context" + "slices" "time" - "golang.org/x/exp/slices" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/healthcheck/health" "github.com/coder/coder/v2/codersdk/healthsdk" diff --git a/coderd/healthcheck/derphealth/derp.go b/coderd/healthcheck/derphealth/derp.go index f74db243cb..fa24ebe757 100644 --- a/coderd/healthcheck/derphealth/derp.go +++ b/coderd/healthcheck/derphealth/derp.go @@ -6,12 +6,12 @@ import ( "net" "net/netip" "net/url" + "slices" "strings" "sync" "sync/atomic" "time" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "tailscale.com/derp" "tailscale.com/derp/derphttp" diff --git a/coderd/httpmw/apikey_test.go b/coderd/httpmw/apikey_test.go index c2e69eb7ae..bd979e8823 100644 --- a/coderd/httpmw/apikey_test.go +++ b/coderd/httpmw/apikey_test.go @@ -9,6 +9,7 @@ import ( "net" "net/http" "net/http/httptest" + "slices" "strings" "sync/atomic" "testing" @@ -17,7 +18,6 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "golang.org/x/oauth2" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/idpsync/group_test.go b/coderd/idpsync/group_test.go index 2baafd53ff..7fbfd3bfe4 100644 --- a/coderd/idpsync/group_test.go +++ b/coderd/idpsync/group_test.go @@ -4,12 +4,12 @@ import ( "context" "database/sql" "regexp" + "slices" "testing" "github.com/golang-jwt/jwt/v4" "github.com/google/uuid" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "cdr.dev/slog/sloggers/slogtest" diff --git a/coderd/idpsync/role.go b/coderd/idpsync/role.go index 5cb0ac1725..22e0edc3bc 100644 --- a/coderd/idpsync/role.go +++ b/coderd/idpsync/role.go @@ -3,10 +3,10 @@ package idpsync import ( "context" "encoding/json" + "slices" "github.com/golang-jwt/jwt/v4" "github.com/google/uuid" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "cdr.dev/slog" diff --git a/coderd/idpsync/role_test.go b/coderd/idpsync/role_test.go index 45e9edd6c1..7d68644214 100644 --- a/coderd/idpsync/role_test.go +++ b/coderd/idpsync/role_test.go @@ -3,13 +3,13 @@ package idpsync_test import ( "context" "encoding/json" + "slices" "testing" "github.com/golang-jwt/jwt/v4" "github.com/google/uuid" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "golang.org/x/exp/slices" "cdr.dev/slog/sloggers/slogtest" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/insights.go b/coderd/insights.go index 9c9fdcfa3c..9f2bbf5d8b 100644 --- a/coderd/insights.go +++ b/coderd/insights.go @@ -5,18 +5,17 @@ import ( "database/sql" "fmt" "net/http" + "slices" "strings" "time" - "github.com/coder/coder/v2/coderd/database/dbtime" - "github.com/google/uuid" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" + "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/rbac/policy" diff --git a/coderd/notifications_test.go b/coderd/notifications_test.go index 2e8d851522..d504648692 100644 --- a/coderd/notifications_test.go +++ b/coderd/notifications_test.go @@ -2,10 +2,10 @@ package coderd_test import ( "net/http" + "slices" "testing" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "github.com/coder/serpent" diff --git a/coderd/prometheusmetrics/insights/metricscollector.go b/coderd/prometheusmetrics/insights/metricscollector.go index 7dcf6025f2..f7ecb06e96 100644 --- a/coderd/prometheusmetrics/insights/metricscollector.go +++ b/coderd/prometheusmetrics/insights/metricscollector.go @@ -2,12 +2,12 @@ package insights import ( "context" + "slices" "sync/atomic" "time" "github.com/google/uuid" "github.com/prometheus/client_golang/prometheus" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "golang.org/x/xerrors" diff --git a/coderd/provisionerdserver/acquirer.go b/coderd/provisionerdserver/acquirer.go index 4c2fe6b1d4..a655edebfd 100644 --- a/coderd/provisionerdserver/acquirer.go +++ b/coderd/provisionerdserver/acquirer.go @@ -4,13 +4,13 @@ import ( "context" "database/sql" "encoding/json" + "slices" "strings" "sync" "time" "github.com/cenkalti/backoff/v4" "github.com/google/uuid" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "cdr.dev/slog" diff --git a/coderd/provisionerdserver/acquirer_test.go b/coderd/provisionerdserver/acquirer_test.go index 6e4d6a4ff7..22794c7265 100644 --- a/coderd/provisionerdserver/acquirer_test.go +++ b/coderd/provisionerdserver/acquirer_test.go @@ -5,6 +5,7 @@ import ( "database/sql" "encoding/json" "fmt" + "slices" "strings" "sync" "testing" @@ -15,7 +16,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" - "golang.org/x/exp/slices" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbmem" diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go index 3c9650ffc8..3c82a41d93 100644 --- a/coderd/provisionerdserver/provisionerdserver.go +++ b/coderd/provisionerdserver/provisionerdserver.go @@ -9,6 +9,7 @@ import ( "net/http" "net/url" "reflect" + "slices" "sort" "strconv" "strings" @@ -20,7 +21,6 @@ import ( semconv "go.opentelemetry.io/otel/semconv/v1.14.0" "go.opentelemetry.io/otel/trace" "golang.org/x/exp/maps" - "golang.org/x/exp/slices" "golang.org/x/oauth2" "golang.org/x/xerrors" protobuf "google.golang.org/protobuf/proto" diff --git a/coderd/userpassword/userpassword.go b/coderd/userpassword/userpassword.go index fa16a2c89e..2fb01a76d2 100644 --- a/coderd/userpassword/userpassword.go +++ b/coderd/userpassword/userpassword.go @@ -7,12 +7,12 @@ import ( "encoding/base64" "fmt" "os" + "slices" "strconv" "strings" passwordvalidator "github.com/wagslane/go-password-validator" "golang.org/x/crypto/pbkdf2" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd/util/lazy" diff --git a/coderd/users_test.go b/coderd/users_test.go index 74c27da7ef..2d85a9823a 100644 --- a/coderd/users_test.go +++ b/coderd/users_test.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "net/http" + "slices" "strings" "testing" "time" @@ -19,7 +20,6 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "golang.org/x/xerrors" diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go index ddfb21a751..ff16735af9 100644 --- a/coderd/workspaceagents.go +++ b/coderd/workspaceagents.go @@ -9,6 +9,7 @@ import ( "io" "net/http" "net/url" + "slices" "sort" "strconv" "strings" @@ -17,7 +18,6 @@ import ( "github.com/google/uuid" "github.com/sqlc-dev/pqtype" "golang.org/x/exp/maps" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "golang.org/x/xerrors" "tailscale.com/tailcfg" diff --git a/coderd/workspaceapps/db.go b/coderd/workspaceapps/db.go index 1aa4dfe91b..6029839599 100644 --- a/coderd/workspaceapps/db.go +++ b/coderd/workspaceapps/db.go @@ -7,10 +7,10 @@ import ( "net/http" "net/url" "path" + "slices" "strings" "time" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "github.com/go-jose/go-jose/v4/jwt" diff --git a/coderd/workspaceapps/stats_test.go b/coderd/workspaceapps/stats_test.go index c2c722929e..51a6d9eebf 100644 --- a/coderd/workspaceapps/stats_test.go +++ b/coderd/workspaceapps/stats_test.go @@ -2,6 +2,7 @@ package workspaceapps_test import ( "context" + "slices" "sync" "sync/atomic" "testing" @@ -10,7 +11,6 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go index 76166bfcb6..735d6025dd 100644 --- a/coderd/workspacebuilds.go +++ b/coderd/workspacebuilds.go @@ -7,13 +7,13 @@ import ( "fmt" "math" "net/http" + "slices" "sort" "strconv" "time" "github.com/go-chi/chi/v5" "github.com/google/uuid" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "golang.org/x/xerrors" diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go index f6bfcfd2ea..84efaa7ed0 100644 --- a/coderd/workspacebuilds_test.go +++ b/coderd/workspacebuilds_test.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "net/http" + "slices" "strconv" "testing" "time" @@ -14,7 +15,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "cdr.dev/slog" diff --git a/codersdk/agentsdk/logs_internal_test.go b/codersdk/agentsdk/logs_internal_test.go index 48149b83c4..6333ffa19f 100644 --- a/codersdk/agentsdk/logs_internal_test.go +++ b/codersdk/agentsdk/logs_internal_test.go @@ -2,12 +2,12 @@ package agentsdk import ( "context" + "slices" "testing" "time" "github.com/google/uuid" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "golang.org/x/xerrors" protobuf "google.golang.org/protobuf/proto" diff --git a/codersdk/agentsdk/logs_test.go b/codersdk/agentsdk/logs_test.go index bb4948cb90..2b3b934c8d 100644 --- a/codersdk/agentsdk/logs_test.go +++ b/codersdk/agentsdk/logs_test.go @@ -4,13 +4,13 @@ import ( "context" "fmt" "net/http" + "slices" "testing" "time" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" diff --git a/codersdk/healthsdk/interfaces_internal_test.go b/codersdk/healthsdk/interfaces_internal_test.go index 2996c6e1f0..f870e54316 100644 --- a/codersdk/healthsdk/interfaces_internal_test.go +++ b/codersdk/healthsdk/interfaces_internal_test.go @@ -3,11 +3,11 @@ package healthsdk import ( "net" "net/netip" + "slices" "strings" "testing" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "tailscale.com/net/interfaces" "github.com/coder/coder/v2/coderd/healthcheck/health" diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go index 2a9472f1cb..014a68bbce 100644 --- a/codersdk/provisionerdaemons.go +++ b/codersdk/provisionerdaemons.go @@ -7,13 +7,13 @@ import ( "io" "net/http" "net/http/cookiejar" + "slices" "strings" "time" "github.com/google/uuid" "github.com/hashicorp/yamux" "golang.org/x/exp/maps" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "github.com/coder/coder/v2/buildinfo" diff --git a/enterprise/coderd/license/license_test.go b/enterprise/coderd/license/license_test.go index ad7fc68f58..b8b25b9535 100644 --- a/enterprise/coderd/license/license_test.go +++ b/enterprise/coderd/license/license_test.go @@ -3,13 +3,13 @@ package license_test import ( "context" "fmt" + "slices" "testing" "time" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbmem" diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go index a871a0ddca..3c86970ec0 100644 --- a/pty/ptytest/ptytest.go +++ b/pty/ptytest/ptytest.go @@ -8,6 +8,7 @@ import ( "io" "regexp" "runtime" + "slices" "strings" "sync" "testing" @@ -16,7 +17,6 @@ import ( "github.com/acarl005/stripansi" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "github.com/coder/coder/v2/pty" diff --git a/scaletest/workspacetraffic/run_test.go b/scaletest/workspacetraffic/run_test.go index 980e0d62ed..fe3fd389df 100644 --- a/scaletest/workspacetraffic/run_test.go +++ b/scaletest/workspacetraffic/run_test.go @@ -7,6 +7,7 @@ import ( "net/http" "net/http/httptest" "runtime" + "slices" "strings" "sync" "testing" @@ -15,7 +16,6 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "github.com/coder/coder/v2/agent/agenttest" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/site/site.go b/site/site.go index e2209b4052..e0e9a13285 100644 --- a/site/site.go +++ b/site/site.go @@ -19,6 +19,7 @@ import ( "os" "path" "path/filepath" + "slices" "strings" "sync" "sync/atomic" @@ -29,7 +30,6 @@ import ( "github.com/justinas/nosurf" "github.com/klauspost/compress/zstd" "github.com/unrolled/secure" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "golang.org/x/sync/singleflight" "golang.org/x/xerrors" diff --git a/tailnet/node.go b/tailnet/node.go index 858af3ad71..1077a7d69c 100644 --- a/tailnet/node.go +++ b/tailnet/node.go @@ -3,11 +3,11 @@ package tailnet import ( "context" "net/netip" + "slices" "sync" "time" "golang.org/x/exp/maps" - "golang.org/x/exp/slices" "tailscale.com/tailcfg" "tailscale.com/types/key" "tailscale.com/wgengine" diff --git a/tailnet/node_internal_test.go b/tailnet/node_internal_test.go index 7a22225366..0c04a66809 100644 --- a/tailnet/node_internal_test.go +++ b/tailnet/node_internal_test.go @@ -2,13 +2,13 @@ package tailnet import ( "net/netip" + "slices" "testing" "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/exp/maps" - "golang.org/x/exp/slices" "golang.org/x/xerrors" "tailscale.com/tailcfg" "tailscale.com/types/key"