Skip to content

Commit 45813d5

Browse files
doriabledoriable
committed
Merge remote-tracking branch 'origin/main' into ppc64le-bin-and-readme
2 parents 28fb0fd + 0080105 commit 45813d5

File tree

203 files changed

+206
-2675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+206
-2675
lines changed

‎go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ require (
1414
buf.build/go/protovalidate v0.12.0
1515
buf.build/go/protoyaml v0.6.0
1616
buf.build/go/spdx v0.2.0
17+
buf.build/go/standard v0.1.0
1718
connectrpc.com/connect v1.18.1
1819
connectrpc.com/otelconnect v0.7.2
1920
github.com/bufbuild/protocompile v0.14.1

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ buf.build/go/protoyaml v0.6.0 h1:Nzz1lvcXF8YgNZXk+voPPwdU8FjDPTUV4ndNTXN0n2w=
2020
buf.build/go/protoyaml v0.6.0/go.mod h1:RgUOsBu/GYKLDSIRgQXniXbNgFlGEZnQpRAUdLAFV2Q=
2121
buf.build/go/spdx v0.2.0 h1:IItqM0/cMxvFJJumcBuP8NrsIzMs/UYjp/6WSpq8LTw=
2222
buf.build/go/spdx v0.2.0/go.mod h1:bXdwQFem9Si3nsbNy8aJKGPoaPi5DKwdeEp5/ArZ6w8=
23+
buf.build/go/standard v0.1.0 h1:g98T9IyvAl0vS3Pq8iVk6Cvj2ZiFvoUJRtfyGa0120U=
24+
buf.build/go/standard v0.1.0/go.mod h1:PiqpHz/7ZFq+kqvYhc/SK3lxFIB9N/aiH2CFC2JHIQg=
2325
cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
2426
cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
2527
connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=

‎private/buf/bufcli/flags_args.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
pluginv1beta1 "buf.build/gen/go/bufbuild/registry/protocolbuffers/go/buf/registry/plugin/v1beta1"
2424
"buf.build/go/app"
2525
"buf.build/go/app/appcmd"
26+
"buf.build/go/standard/xstrings"
2627
"github.com/bufbuild/buf/private/buf/buffetch"
27-
"github.com/bufbuild/buf/private/pkg/standard/xstrings"
2828
"github.com/spf13/pflag"
2929
)
3030

‎private/buf/bufctl/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ import (
2929
"buf.build/go/app/appcmd"
3030
"buf.build/go/protovalidate"
3131
"buf.build/go/protoyaml"
32+
"buf.build/go/standard/xio"
33+
"buf.build/go/standard/xslices"
3234
"github.com/bufbuild/buf/private/buf/buffetch"
3335
"github.com/bufbuild/buf/private/buf/bufwkt/bufwktstore"
3436
"github.com/bufbuild/buf/private/buf/bufworkspace"
@@ -47,8 +49,6 @@ import (
4749
"github.com/bufbuild/buf/private/pkg/httpauth"
4850
"github.com/bufbuild/buf/private/pkg/normalpath"
4951
"github.com/bufbuild/buf/private/pkg/protoencoding"
50-
"github.com/bufbuild/buf/private/pkg/standard/xio"
51-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
5252
"github.com/bufbuild/buf/private/pkg/storage/storageos"
5353
"github.com/bufbuild/buf/private/pkg/syserror"
5454
"github.com/bufbuild/buf/private/pkg/wasm"

‎private/buf/buffetch/buffetch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import (
2323
"net/http"
2424

2525
"buf.build/go/app"
26+
"buf.build/go/standard/xstrings"
2627
"github.com/bufbuild/buf/private/buf/buffetch/internal"
2728
"github.com/bufbuild/buf/private/buf/buftarget"
2829
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
2930
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
3031
"github.com/bufbuild/buf/private/pkg/git"
3132
"github.com/bufbuild/buf/private/pkg/httpauth"
32-
"github.com/bufbuild/buf/private/pkg/standard/xstrings"
3333
"github.com/bufbuild/buf/private/pkg/storage/storageos"
3434
)
3535

‎private/buf/buffetch/internal/dir_ref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"strings"
1919

2020
"buf.build/go/app"
21+
"buf.build/go/standard/xpath/xfilepath"
2122
"github.com/bufbuild/buf/private/pkg/normalpath"
22-
"github.com/bufbuild/buf/private/pkg/standard/xpath/xfilepath"
2323
)
2424

2525
var (

‎private/buf/buffetch/internal/proto_file_writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"os"
2424

2525
"buf.build/go/app"
26+
"buf.build/go/standard/xio"
2627
"github.com/bufbuild/buf/private/pkg/normalpath"
27-
"github.com/bufbuild/buf/private/pkg/standard/xio"
2828
)
2929

3030
type protoFileWriter struct {

‎private/buf/buffetch/internal/reader.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ import (
2727
"path/filepath"
2828

2929
"buf.build/go/app"
30+
"buf.build/go/standard/xio"
31+
"buf.build/go/standard/xslices"
3032
"github.com/bufbuild/buf/private/buf/buftarget"
3133
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
3234
"github.com/bufbuild/buf/private/bufpkg/bufparse"
3335
"github.com/bufbuild/buf/private/pkg/git"
3436
"github.com/bufbuild/buf/private/pkg/httpauth"
3537
"github.com/bufbuild/buf/private/pkg/normalpath"
3638
"github.com/bufbuild/buf/private/pkg/osext"
37-
"github.com/bufbuild/buf/private/pkg/standard/xio"
38-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
3939
"github.com/bufbuild/buf/private/pkg/storage"
4040
"github.com/bufbuild/buf/private/pkg/storage/storagearchive"
4141
"github.com/bufbuild/buf/private/pkg/storage/storagemem"

‎private/buf/buffetch/internal/writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"os"
2525

2626
"buf.build/go/app"
27-
"github.com/bufbuild/buf/private/pkg/standard/xio"
27+
"buf.build/go/standard/xio"
2828
"github.com/klauspost/compress/zstd"
2929
)
3030

‎private/buf/bufgen/features.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"slices"
2222
"strings"
2323

24+
"buf.build/go/standard/xslices"
2425
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
2526
"github.com/bufbuild/buf/private/bufpkg/bufimage"
26-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
2727
"google.golang.org/protobuf/reflect/protoreflect"
2828
"google.golang.org/protobuf/types/descriptorpb"
2929
"google.golang.org/protobuf/types/pluginpb"

‎private/buf/bufgen/generator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"sort"
2424

2525
"buf.build/go/app"
26+
"buf.build/go/standard/xslices"
2627
connect "connectrpc.com/connect"
2728
"github.com/bufbuild/buf/private/buf/bufprotopluginexec"
2829
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
@@ -36,7 +37,6 @@ import (
3637
"github.com/bufbuild/buf/private/gen/proto/connect/buf/alpha/registry/v1alpha1/registryv1alpha1connect"
3738
registryv1alpha1 "github.com/bufbuild/buf/private/gen/proto/go/buf/alpha/registry/v1alpha1"
3839
"github.com/bufbuild/buf/private/pkg/connectclient"
39-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
4040
"github.com/bufbuild/buf/private/pkg/storage/storageos"
4141
"github.com/bufbuild/buf/private/pkg/thread"
4242
"google.golang.org/protobuf/types/pluginpb"

‎private/buf/buflsp/buflsp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"sync/atomic"
2626

2727
"buf.build/go/app/appext"
28+
"buf.build/go/standard/xlog/xslog"
2829
"github.com/bufbuild/buf/private/buf/bufctl"
29-
"github.com/bufbuild/buf/private/pkg/standard/xlog/xslog"
3030
"github.com/bufbuild/buf/private/pkg/storage"
3131
"github.com/bufbuild/buf/private/pkg/storage/storageos"
3232
"github.com/bufbuild/buf/private/pkg/wasm"

‎private/buf/buflsp/file.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ import (
2828
"strings"
2929
"time"
3030

31+
"buf.build/go/standard/xio"
32+
"buf.build/go/standard/xlog/xslog"
3133
"github.com/bufbuild/buf/private/buf/bufworkspace"
3234
"github.com/bufbuild/buf/private/bufpkg/bufanalysis"
3335
"github.com/bufbuild/buf/private/bufpkg/bufcheck"
3436
"github.com/bufbuild/buf/private/bufpkg/bufimage"
3537
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
3638
"github.com/bufbuild/buf/private/pkg/git"
3739
"github.com/bufbuild/buf/private/pkg/normalpath"
38-
"github.com/bufbuild/buf/private/pkg/standard/xio"
39-
"github.com/bufbuild/buf/private/pkg/standard/xlog/xslog"
4040
"github.com/bufbuild/buf/private/pkg/storage"
4141
"github.com/bufbuild/protocompile/ast"
4242
"github.com/bufbuild/protocompile/parser"

‎private/buf/buflsp/image.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"io"
2121
"log/slog"
2222

23+
"buf.build/go/standard/xlog/xslog"
2324
"github.com/bufbuild/buf/private/bufpkg/bufimage"
24-
"github.com/bufbuild/buf/private/pkg/standard/xlog/xslog"
2525
"github.com/bufbuild/protocompile"
2626
"github.com/bufbuild/protocompile/linker"
2727
"github.com/bufbuild/protocompile/protoutil"

‎private/buf/buflsp/jsonrpc_wrappers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"context"
2222
"log/slog"
2323

24-
"github.com/bufbuild/buf/private/pkg/standard/xlog/xslog"
24+
"buf.build/go/standard/xlog/xslog"
2525
"go.lsp.dev/jsonrpc2"
2626
)
2727

‎private/buf/buflsp/symbol.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"slices"
2828
"strings"
2929

30+
"buf.build/go/standard/xslices"
3031
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
31-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
3232
"github.com/bufbuild/protocompile/ast"
3333
"go.lsp.dev/protocol"
3434
"google.golang.org/protobuf/encoding/protowire"

‎private/buf/bufmigrate/migrate_builder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import (
2121
"io/fs"
2222
"log/slog"
2323

24+
"buf.build/go/standard/xslices"
25+
"buf.build/go/standard/xstrings"
2426
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
2527
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
2628
"github.com/bufbuild/buf/private/bufpkg/bufparse"
2729
"github.com/bufbuild/buf/private/pkg/normalpath"
28-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
29-
"github.com/bufbuild/buf/private/pkg/standard/xstrings"
3030
"github.com/bufbuild/buf/private/pkg/storage"
3131
"github.com/bufbuild/buf/private/pkg/syserror"
3232
"github.com/google/uuid"

‎private/buf/bufmigrate/migrator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import (
2626
"strings"
2727

2828
"buf.build/go/bufplugin/check"
29+
"buf.build/go/standard/xslices"
2930
"github.com/bufbuild/buf/private/bufpkg/bufcheck"
3031
"github.com/bufbuild/buf/private/bufpkg/bufcheck/bufcheckserver"
3132
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
3233
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
3334
"github.com/bufbuild/buf/private/bufpkg/bufparse"
3435
"github.com/bufbuild/buf/private/pkg/normalpath"
35-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
3636
"github.com/bufbuild/buf/private/pkg/storage"
3737
"github.com/bufbuild/buf/private/pkg/storage/storagemem"
3838
"github.com/google/uuid"

‎private/buf/bufprint/bufprint.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828
modulev1 "buf.build/gen/go/bufbuild/registry/protocolbuffers/go/buf/registry/module/v1"
2929
ownerv1 "buf.build/gen/go/bufbuild/registry/protocolbuffers/go/buf/registry/owner/v1"
3030
pluginv1beta1 "buf.build/gen/go/bufbuild/registry/protocolbuffers/go/buf/registry/plugin/v1beta1"
31+
"buf.build/go/standard/xstrings"
3132
"github.com/bufbuild/buf/private/bufpkg/bufparse"
3233
registryv1alpha1 "github.com/bufbuild/buf/private/gen/proto/go/buf/alpha/registry/v1alpha1"
3334
"github.com/bufbuild/buf/private/pkg/protoencoding"
3435
"github.com/bufbuild/buf/private/pkg/protostat"
35-
"github.com/bufbuild/buf/private/pkg/standard/xstrings"
3636
"github.com/bufbuild/buf/private/pkg/syserror"
3737
"google.golang.org/protobuf/proto"
3838
"google.golang.org/protobuf/types/known/timestamppb"

‎private/buf/bufprotoc/bufprotoc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"log/slog"
2222
"sort"
2323

24+
"buf.build/go/standard/xslices"
25+
"buf.build/go/standard/xstrings"
2426
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
2527
"github.com/bufbuild/buf/private/pkg/normalpath"
26-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
27-
"github.com/bufbuild/buf/private/pkg/standard/xstrings"
2828
"github.com/bufbuild/buf/private/pkg/storage"
2929
"github.com/bufbuild/buf/private/pkg/storage/storageos"
3030
)

‎private/buf/bufprotopluginexec/binary_handler.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"log/slog"
2222
"path/filepath"
2323

24+
"buf.build/go/standard/xio"
25+
"buf.build/go/standard/xlog/xslog"
26+
"buf.build/go/standard/xos/xexec"
2427
"github.com/bufbuild/buf/private/pkg/protoencoding"
25-
"github.com/bufbuild/buf/private/pkg/standard/xio"
26-
"github.com/bufbuild/buf/private/pkg/standard/xlog/xslog"
27-
"github.com/bufbuild/buf/private/pkg/standard/xos/xexec"
2828
"github.com/bufbuild/protoplugin"
2929
"google.golang.org/protobuf/types/pluginpb"
3030
)

‎private/buf/bufprotopluginexec/protoc_proxy_handler.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
"strings"
2727

2828
"buf.build/go/app"
29+
"buf.build/go/standard/xio"
30+
"buf.build/go/standard/xlog/xslog"
31+
"buf.build/go/standard/xos/xexec"
2932
"github.com/bufbuild/buf/private/pkg/protoencoding"
30-
"github.com/bufbuild/buf/private/pkg/standard/xio"
31-
"github.com/bufbuild/buf/private/pkg/standard/xlog/xslog"
32-
"github.com/bufbuild/buf/private/pkg/standard/xos/xexec"
3333
"github.com/bufbuild/buf/private/pkg/storage"
3434
"github.com/bufbuild/buf/private/pkg/storage/storageos"
3535
"github.com/bufbuild/buf/private/pkg/tmp"

‎private/buf/bufstudioagent/bufstudioagent_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828
"testing"
2929
"time"
3030

31+
"buf.build/go/standard/xlog/xslog"
3132
"connectrpc.com/connect"
3233
studiov1alpha1 "github.com/bufbuild/buf/private/gen/proto/go/buf/alpha/studio/v1alpha1"
3334
"github.com/bufbuild/buf/private/pkg/protoencoding"
3435
"github.com/bufbuild/buf/private/pkg/slogtestext"
35-
"github.com/bufbuild/buf/private/pkg/standard/xlog/xslog"
3636
"github.com/stretchr/testify/assert"
3737
"github.com/stretchr/testify/require"
3838
"golang.org/x/net/http2"

‎private/buf/bufstudioagent/plain_post_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"net/textproto"
2828
"net/url"
2929

30+
"buf.build/go/standard/xlog/xslog"
3031
"connectrpc.com/connect"
3132
studiov1alpha1 "github.com/bufbuild/buf/private/gen/proto/go/buf/alpha/studio/v1alpha1"
3233
"github.com/bufbuild/buf/private/pkg/protoencoding"
33-
"github.com/bufbuild/buf/private/pkg/standard/xlog/xslog"
3434
"golang.org/x/net/http2"
3535
"google.golang.org/protobuf/proto"
3636
)

‎private/buf/buftesting/buftesting.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import (
2222
"testing"
2323
"time"
2424

25+
"buf.build/go/standard/xlog/xslog"
2526
"github.com/bufbuild/buf/private/buf/bufprotoc"
2627
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
2728
"github.com/bufbuild/buf/private/pkg/github/githubtesting"
2829
"github.com/bufbuild/buf/private/pkg/normalpath"
2930
"github.com/bufbuild/buf/private/pkg/prototesting"
30-
"github.com/bufbuild/buf/private/pkg/standard/xlog/xslog"
3131
"github.com/bufbuild/buf/private/pkg/storage/storageos"
3232
"github.com/stretchr/testify/require"
3333
"google.golang.org/protobuf/types/descriptorpb"

‎private/buf/bufwkt/cmd/wkt-go-data/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ import (
2929
"buf.build/go/app"
3030
"buf.build/go/app/appcmd"
3131
"buf.build/go/app/appext"
32+
"buf.build/go/standard/xslices"
3233
"github.com/bufbuild/buf/private/bufpkg/bufanalysis"
3334
"github.com/bufbuild/buf/private/bufpkg/bufimage"
3435
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
3536
"github.com/bufbuild/buf/private/bufpkg/bufprotosource"
3637
"github.com/bufbuild/buf/private/pkg/slogapp"
37-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
3838
"github.com/bufbuild/buf/private/pkg/storage"
3939
"github.com/bufbuild/buf/private/pkg/storage/storageos"
4040
"github.com/spf13/pflag"

‎private/buf/bufworkspace/malformed_dep.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ package bufworkspace
1717
import (
1818
"sort"
1919

20+
"buf.build/go/standard/xslices"
2021
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
2122
"github.com/bufbuild/buf/private/bufpkg/bufparse"
22-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
2323
"github.com/bufbuild/buf/private/pkg/syserror"
2424
)
2525

‎private/buf/bufworkspace/module_targeting.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ package bufworkspace
1717
import (
1818
"fmt"
1919

20+
"buf.build/go/standard/xslices"
21+
"buf.build/go/standard/xstrings"
2022
"github.com/bufbuild/buf/private/buf/buftarget"
2123
"github.com/bufbuild/buf/private/pkg/normalpath"
22-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
23-
"github.com/bufbuild/buf/private/pkg/standard/xstrings"
2424
"github.com/bufbuild/buf/private/pkg/syserror"
2525
)
2626

‎private/buf/bufworkspace/option.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
package bufworkspace
1616

1717
import (
18+
"buf.build/go/standard/xslices"
1819
"github.com/bufbuild/buf/private/pkg/normalpath"
19-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
2020
)
2121

2222
// WorkspaceBucketOption is an option for a new Workspace created by a Bucket.

‎private/buf/bufworkspace/workspace_dep_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020
"io/fs"
2121
"sort"
2222

23+
"buf.build/go/standard/xslices"
2324
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
2425
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
2526
"github.com/bufbuild/buf/private/bufpkg/bufparse"
2627
"github.com/bufbuild/buf/private/bufpkg/bufplugin"
27-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
2828
"github.com/bufbuild/buf/private/pkg/storage"
2929
"github.com/bufbuild/buf/private/pkg/syserror"
3030
)

‎private/buf/bufworkspace/workspace_provider.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ import (
2121
"io/fs"
2222
"log/slog"
2323

24+
"buf.build/go/standard/xlog/xslog"
25+
"buf.build/go/standard/xslices"
26+
"buf.build/go/standard/xstrings"
2427
"github.com/bufbuild/buf/private/buf/buftarget"
2528
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
2629
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
2730
"github.com/bufbuild/buf/private/bufpkg/bufparse"
2831
"github.com/bufbuild/buf/private/bufpkg/bufplugin"
2932
"github.com/bufbuild/buf/private/pkg/normalpath"
30-
"github.com/bufbuild/buf/private/pkg/standard/xlog/xslog"
31-
"github.com/bufbuild/buf/private/pkg/standard/xslices"
32-
"github.com/bufbuild/buf/private/pkg/standard/xstrings"
3333
"github.com/bufbuild/buf/private/pkg/storage"
3434
"github.com/bufbuild/buf/private/pkg/syserror"
3535
"github.com/google/uuid"

0 commit comments

Comments
 (0)