Skip to content

Commit b100e12

Browse files
rscgopherbot
authored andcommitted
cmd/go: delete cmd/go/internal/slices in favor of slices
Some files already use "slices", others use "cmd/go/internal/slices". (Some files are using more than slices.Clip and must use "slices".) Use "slices" consistently and delete cmd/go/internal/slices. Change-Id: I69ec680106ad2924276f7473e6547a3a907efc96 Reviewed-on: https://go-review.googlesource.com/c/go/+/499715 Run-TryBot: Russ Cox <[email protected]> Reviewed-by: Bryan Mills <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Auto-Submit: Russ Cox <[email protected]>
1 parent abdaa0f commit b100e12

File tree

9 files changed

+10
-21
lines changed

9 files changed

+10
-21
lines changed

src/cmd/go/internal/generate/generate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ import (
1818
"os/exec"
1919
"path/filepath"
2020
"regexp"
21+
"slices"
2122
"strconv"
2223
"strings"
2324

2425
"cmd/go/internal/base"
2526
"cmd/go/internal/cfg"
2627
"cmd/go/internal/load"
2728
"cmd/go/internal/modload"
28-
"cmd/go/internal/slices"
2929
"cmd/go/internal/str"
3030
"cmd/go/internal/work"
3131
)

src/cmd/go/internal/modload/init.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"os"
1515
"path"
1616
"path/filepath"
17+
"slices"
1718
"strconv"
1819
"strings"
1920
"sync"
@@ -26,7 +27,6 @@ import (
2627
"cmd/go/internal/modconv"
2728
"cmd/go/internal/modfetch"
2829
"cmd/go/internal/search"
29-
"cmd/go/internal/slices"
3030

3131
"golang.org/x/mod/modfile"
3232
"golang.org/x/mod/module"

src/cmd/go/internal/modload/query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"io/fs"
1313
"os"
1414
pathpkg "path"
15+
"slices"
1516
"sort"
1617
"strings"
1718
"sync"
@@ -24,7 +25,6 @@ import (
2425
"cmd/go/internal/modfetch/codehost"
2526
"cmd/go/internal/modinfo"
2627
"cmd/go/internal/search"
27-
"cmd/go/internal/slices"
2828
"cmd/go/internal/str"
2929
"cmd/go/internal/trace"
3030
"cmd/internal/pkgpattern"

src/cmd/go/internal/mvs/graph.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package mvs
66

77
import (
8-
"cmd/go/internal/gover"
9-
"cmd/go/internal/slices"
108
"fmt"
9+
"slices"
10+
11+
"cmd/go/internal/gover"
1112

1213
"golang.org/x/mod/module"
1314
)

src/cmd/go/internal/slices/slices.go

-12
This file was deleted.

src/cmd/go/internal/test/test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"os/exec"
1717
"path/filepath"
1818
"regexp"
19+
"slices"
1920
"strconv"
2021
"strings"
2122
"sync"
@@ -28,7 +29,6 @@ import (
2829
"cmd/go/internal/lockedfile"
2930
"cmd/go/internal/modload"
3031
"cmd/go/internal/search"
31-
"cmd/go/internal/slices"
3232
"cmd/go/internal/str"
3333
"cmd/go/internal/trace"
3434
"cmd/go/internal/work"

src/cmd/go/internal/vcweb/git.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
package vcweb
66

77
import (
8-
"cmd/go/internal/slices"
98
"log"
109
"net/http"
1110
"net/http/cgi"
1211
"os/exec"
1312
"runtime"
13+
"slices"
1414
"sync"
1515
)
1616

src/cmd/go/internal/vcweb/hg.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package vcweb
66

77
import (
88
"bufio"
9-
"cmd/go/internal/slices"
109
"context"
1110
"errors"
1211
"io"
@@ -16,6 +15,7 @@ import (
1615
"net/url"
1716
"os"
1817
"os/exec"
18+
"slices"
1919
"strings"
2020
"sync"
2121
"time"

src/cmd/go/internal/work/exec.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"path/filepath"
2626
"regexp"
2727
"runtime"
28+
"slices"
2829
"sort"
2930
"strconv"
3031
"strings"
@@ -38,7 +39,6 @@ import (
3839
"cmd/go/internal/gover"
3940
"cmd/go/internal/load"
4041
"cmd/go/internal/modload"
41-
"cmd/go/internal/slices"
4242
"cmd/go/internal/str"
4343
"cmd/go/internal/trace"
4444
"cmd/internal/buildid"

0 commit comments

Comments
 (0)