diff --git a/conv/decode.go b/conv/decode.go index f08700581..40c1534ed 100644 --- a/conv/decode.go +++ b/conv/decode.go @@ -4,11 +4,11 @@ import ( "net" "net/netip" "net/url" + "slices" "strconv" "time" "github.com/google/uuid" - "golang.org/x/exp/slices" ) func ToInt(s string) (int, error) { diff --git a/dsl.go b/dsl.go index 1da767ace..98c0b13f4 100644 --- a/dsl.go +++ b/dsl.go @@ -2,10 +2,10 @@ package ogen import ( "encoding/json" + "slices" "strings" "github.com/go-faster/jx" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen/jsonschema" "github.com/ogen-go/ogen/openapi" diff --git a/examples/hack.go b/examples/hack.go index 6a1c8fda1..e835969e4 100644 --- a/examples/hack.go +++ b/examples/hack.go @@ -7,6 +7,5 @@ import ( _ "go.uber.org/zap" _ "golang.org/x/exp/constraints" _ "golang.org/x/exp/maps" - _ "golang.org/x/exp/slices" _ "golang.org/x/tools/imports" ) diff --git a/gen/errors.go b/gen/errors.go index 8b036a7f7..e2bc4842c 100644 --- a/gen/errors.go +++ b/gen/errors.go @@ -2,12 +2,12 @@ package gen import ( "fmt" + "slices" "strings" "github.com/go-faster/errors" "github.com/ogen-go/ogen/gen/ir" "go.uber.org/zap" - "golang.org/x/exp/slices" ) type unimplementedError interface { diff --git a/gen/features.go b/gen/features.go index a4db5aba2..faadf882d 100644 --- a/gen/features.go +++ b/gen/features.go @@ -2,10 +2,10 @@ package gen import ( "fmt" + "slices" "github.com/go-faster/errors" "github.com/go-faster/yaml" - "golang.org/x/exp/slices" ) // Feature is an ogen feature. diff --git a/gen/generator.go b/gen/generator.go index f0c6857e8..c32595413 100644 --- a/gen/generator.go +++ b/gen/generator.go @@ -3,13 +3,13 @@ package gen import ( "os" "path/filepath" + "slices" "strings" "github.com/go-faster/errors" "github.com/go-faster/yaml" "go.uber.org/zap" "golang.org/x/exp/maps" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen" "github.com/ogen-go/ogen/gen/ir" diff --git a/gen/ir/examples.go b/gen/ir/examples.go index 09f42c0b0..c5923fb36 100644 --- a/gen/ir/examples.go +++ b/gen/ir/examples.go @@ -1,10 +1,10 @@ package ir import ( + "slices" "strings" "github.com/go-faster/jx" - "golang.org/x/exp/slices" ) func (t *Type) Examples() (r []string) { diff --git a/gen/ir/field.go b/gen/ir/field.go index 9be597f47..dbb5ee28b 100644 --- a/gen/ir/field.go +++ b/gen/ir/field.go @@ -2,11 +2,10 @@ package ir import ( "fmt" + "slices" "strconv" "strings" - "golang.org/x/exp/slices" - "github.com/ogen-go/ogen/internal/xmaps" "github.com/ogen-go/ogen/jsonschema" "github.com/ogen-go/ogen/openapi" diff --git a/gen/ir/json.go b/gen/ir/json.go index 8b46d5b7e..4767acfd3 100644 --- a/gen/ir/json.go +++ b/gen/ir/json.go @@ -1,10 +1,9 @@ package ir import ( + "slices" "strings" - "golang.org/x/exp/slices" - "github.com/ogen-go/ogen/internal/bitset" "github.com/ogen-go/ogen/internal/naming" "github.com/ogen-go/ogen/internal/xslices" diff --git a/gen/ir/params.go b/gen/ir/params.go index fd85a0cf5..567e021e2 100644 --- a/gen/ir/params.go +++ b/gen/ir/params.go @@ -1,7 +1,7 @@ package ir import ( - "golang.org/x/exp/slices" + "slices" "github.com/ogen-go/ogen/openapi" ) diff --git a/gen/ir/recursion.go b/gen/ir/recursion.go index 381b19f60..128e8aac6 100644 --- a/gen/ir/recursion.go +++ b/gen/ir/recursion.go @@ -3,8 +3,7 @@ package ir import ( "fmt" "reflect" - - "golang.org/x/exp/slices" + "slices" ) func (t *Type) RecursiveTo(target *Type) bool { diff --git a/gen/ir/responses.go b/gen/ir/responses.go index 5b0032f9f..cf7180094 100644 --- a/gen/ir/responses.go +++ b/gen/ir/responses.go @@ -2,9 +2,8 @@ package ir import ( "fmt" + "slices" "strings" - - "golang.org/x/exp/slices" ) type ResponseInfo struct { diff --git a/gen/ir/template_helpers.go b/gen/ir/template_helpers.go index 218ca1a9f..f9db61b16 100644 --- a/gen/ir/template_helpers.go +++ b/gen/ir/template_helpers.go @@ -2,10 +2,9 @@ package ir import ( "fmt" + "slices" "strings" - "golang.org/x/exp/slices" - "github.com/ogen-go/ogen/internal/naming" "github.com/ogen-go/ogen/jsonschema" ) diff --git a/gen/ir/type_features.go b/gen/ir/type_features.go index 95ee90a52..c3c73d717 100644 --- a/gen/ir/type_features.go +++ b/gen/ir/type_features.go @@ -1,6 +1,6 @@ package ir -import "golang.org/x/exp/slices" +import "slices" func (t *Type) HasFeature(feature string) bool { return slices.Contains(t.Features, feature) diff --git a/gen/ir/type_iface.go b/gen/ir/type_iface.go index 440422f22..34b805d4e 100644 --- a/gen/ir/type_iface.go +++ b/gen/ir/type_iface.go @@ -2,10 +2,9 @@ package ir import ( "fmt" + "slices" "strings" - "golang.org/x/exp/slices" - "github.com/ogen-go/ogen/internal/xmaps" ) diff --git a/gen/ir/validation.go b/gen/ir/validation.go index 3376d9de6..ae43d695a 100644 --- a/gen/ir/validation.go +++ b/gen/ir/validation.go @@ -3,10 +3,10 @@ package ir import ( "fmt" "math/big" + "slices" "github.com/go-faster/errors" "github.com/go-faster/jx" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen/jsonschema" "github.com/ogen-go/ogen/ogenregex" diff --git a/gen/options.go b/gen/options.go index cdf4b9313..ec7f2b9b6 100644 --- a/gen/options.go +++ b/gen/options.go @@ -8,12 +8,12 @@ import ( "path/filepath" "regexp" "runtime" + "slices" "strings" "github.com/go-faster/errors" "github.com/go-faster/yaml" "go.uber.org/zap" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen/gen/ir" "github.com/ogen-go/ogen/internal/urlpath" diff --git a/gen/router.go b/gen/router.go index b8b1577b8..1e5a90e36 100644 --- a/gen/router.go +++ b/gen/router.go @@ -1,11 +1,11 @@ package gen import ( + "slices" "sort" "strings" "github.com/go-faster/errors" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen/gen/ir" "github.com/ogen-go/ogen/openapi" diff --git a/gen/schema_gen_sum.go b/gen/schema_gen_sum.go index c56903200..b9dba14e4 100644 --- a/gen/schema_gen_sum.go +++ b/gen/schema_gen_sum.go @@ -5,11 +5,11 @@ import ( "fmt" "path" "reflect" + "slices" "strings" "github.com/go-faster/errors" "github.com/go-faster/jx" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen/gen/ir" "github.com/ogen-go/ogen/internal/xmaps" diff --git a/gen/write.go b/gen/write.go index e57d52774..6e3260b02 100644 --- a/gen/write.go +++ b/gen/write.go @@ -8,11 +8,11 @@ import ( "regexp" "runtime" "runtime/pprof" + "slices" "sync" "text/template" "github.com/go-faster/errors" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "golang.org/x/tools/imports" diff --git a/http/multipart_file.go b/http/multipart_file.go index 6c7871664..398845f4c 100644 --- a/http/multipart_file.go +++ b/http/multipart_file.go @@ -5,9 +5,8 @@ import ( "io" "mime/multipart" "net/textproto" + "slices" "strings" - - "golang.org/x/exp/slices" ) // MultipartFile is multipart form file. diff --git a/internal/xmaps/xmaps.go b/internal/xmaps/xmaps.go index 9797f5bfa..4e9f129dc 100644 --- a/internal/xmaps/xmaps.go +++ b/internal/xmaps/xmaps.go @@ -2,9 +2,10 @@ package xmaps import ( + "slices" + "golang.org/x/exp/constraints" "golang.org/x/exp/maps" - "golang.org/x/exp/slices" ) // SortedKeys returns a sorted slice of keys in the map. diff --git a/internal/xslices/xslices.go b/internal/xslices/xslices.go index fcc5e03cf..9dd15c531 100644 --- a/internal/xslices/xslices.go +++ b/internal/xslices/xslices.go @@ -1,7 +1,7 @@ // Package xslices provides some generic utilities missed from x/exp/slices. package xslices -import "golang.org/x/exp/slices" +import "slices" // Filter performs in-place filtering of a slice. func Filter[S ~[]E, E any](s S, keep func(E) bool) S { diff --git a/jsonschema/infer.go b/jsonschema/infer.go index 9212290c7..cbf987a1a 100644 --- a/jsonschema/infer.go +++ b/jsonschema/infer.go @@ -1,11 +1,11 @@ package jsonschema import ( + "slices" "strings" "github.com/go-faster/errors" "github.com/go-faster/jx" - "golang.org/x/exp/slices" ) // Infer returns a JSON Schema that is inferred from the given JSON. diff --git a/jsonschema/parser.go b/jsonschema/parser.go index 246e614fb..526ca60e2 100644 --- a/jsonschema/parser.go +++ b/jsonschema/parser.go @@ -6,10 +6,10 @@ import ( "fmt" "go/token" "math/big" + "slices" "strings" "github.com/go-faster/errors" - "golang.org/x/exp/slices" ogenjson "github.com/ogen-go/ogen/json" "github.com/ogen-go/ogen/jsonpointer" diff --git a/jsonschema/parser_enum.go b/jsonschema/parser_enum.go index 220c91dd8..e29093324 100644 --- a/jsonschema/parser_enum.go +++ b/jsonschema/parser_enum.go @@ -2,10 +2,10 @@ package jsonschema import ( "encoding/json" + "slices" "github.com/go-faster/errors" "github.com/go-faster/jx" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen/internal/xslices" ) diff --git a/location/error.go b/location/error.go index bf590058e..96ad8166a 100644 --- a/location/error.go +++ b/location/error.go @@ -3,12 +3,12 @@ package location import ( "fmt" "io" + "slices" "strings" "github.com/go-faster/errors" "github.com/go-faster/yaml" "go.uber.org/multierr" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen/internal/xmaps" ) diff --git a/openapi/parser/parse_server.go b/openapi/parser/parse_server.go index a0e6771a2..040dd275e 100644 --- a/openapi/parser/parse_server.go +++ b/openapi/parser/parse_server.go @@ -3,9 +3,9 @@ package parser import ( "fmt" "go/token" + "slices" "github.com/go-faster/errors" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen" "github.com/ogen-go/ogen/jsonpointer" diff --git a/openapi/parser/resolve_test.go b/openapi/parser/resolve_test.go index b6144339b..e2d5d7f0a 100644 --- a/openapi/parser/resolve_test.go +++ b/openapi/parser/resolve_test.go @@ -4,12 +4,12 @@ import ( "encoding/json" "fmt" "net/url" + "slices" "strings" "testing" "github.com/go-faster/yaml" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen" "github.com/ogen-go/ogen/jsonschema" diff --git a/tools/mkformattest/main.go b/tools/mkformattest/main.go index eafc920e2..5f805cf5a 100644 --- a/tools/mkformattest/main.go +++ b/tools/mkformattest/main.go @@ -4,10 +4,10 @@ import ( "encoding/json" "flag" "os" + "slices" "strings" "github.com/go-faster/errors" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen" "github.com/ogen-go/ogen/gen" diff --git a/tools/sgcollector/worker.go b/tools/sgcollector/worker.go index 773f3da31..f4863808e 100644 --- a/tools/sgcollector/worker.go +++ b/tools/sgcollector/worker.go @@ -7,13 +7,13 @@ import ( "net/http" "net/url" "regexp" + "slices" "strings" "time" "github.com/go-faster/errors" "github.com/go-faster/jx" "github.com/go-faster/yaml" - "golang.org/x/exp/slices" "github.com/ogen-go/ogen" "github.com/ogen-go/ogen/gen"