Skip to content

Commit 3fb1d95

Browse files
committed
internal,cmd/internal: relocate covcmd package from std to cmd
Relocate the 'covcmd' package from .../internal/coverage to .../cmd/internal/cov, to reflect the fact that the definitions in this package are used only in cmd, not in std. Cq-Include-Trybots: luci.golang.try:gotip-linux-amd64-longtest,gotip-windows-amd64-longtest Change-Id: I65bcc34736d1d0a23134a6c91c17ff138cd45431 Reviewed-on: https://go-review.googlesource.com/c/go/+/526595 Reviewed-by: Bryan Mills <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent 36e75f6 commit 3fb1d95

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

src/cmd/compile/internal/base/flag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
package base
66

77
import (
8+
"cmd/internal/cov/covcmd"
89
"encoding/json"
910
"flag"
1011
"fmt"
1112
"internal/buildcfg"
12-
"internal/coverage/covcmd"
1313
"internal/platform"
1414
"log"
1515
"os"

src/cmd/cover/cfg_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
package main_test
66

77
import (
8+
"cmd/internal/cov/covcmd"
89
"encoding/json"
910
"fmt"
10-
"internal/coverage/covcmd"
1111
"internal/testenv"
1212
"os"
1313
"path/filepath"

src/cmd/cover/cover.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ package main
66

77
import (
88
"bytes"
9+
"cmd/internal/cov/covcmd"
910
"encoding/json"
1011
"flag"
1112
"fmt"
1213
"go/ast"
1314
"go/parser"
1415
"go/token"
1516
"internal/coverage"
16-
"internal/coverage/covcmd"
1717
"internal/coverage/encodemeta"
1818
"internal/coverage/slicewriter"
1919
"io"
@@ -51,7 +51,7 @@ where -pkgcfg points to a file containing the package path,
5151
package name, module path, and related info from "go build",
5252
and -outfilelist points to a file containing the filenames
5353
of the instrumented output files (one per input file).
54-
See https://pkg.go.dev/internal/coverage/covcmd#CoverPkgConfig for
54+
See https://pkg.go.dev/cmd/internal/cov/covcmd#CoverPkgConfig for
5555
more on the package config.
5656
`
5757

src/cmd/dist/buildtool.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ var bootstrapDirs = []string{
6363
"go/constant",
6464
"internal/abi",
6565
"internal/coverage",
66-
"internal/coverage/covcmd",
66+
"cmd/internal/cov/covcmd",
6767
"internal/bisect",
6868
"internal/buildcfg",
6969
"internal/goarch",

src/cmd/go/internal/work/action.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ package work
99
import (
1010
"bufio"
1111
"bytes"
12+
"cmd/internal/cov/covcmd"
1213
"container/heap"
1314
"context"
1415
"debug/elf"
1516
"encoding/json"
1617
"fmt"
17-
"internal/coverage/covcmd"
1818
"internal/platform"
1919
"os"
2020
"path/filepath"

src/cmd/go/internal/work/cover.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"cmd/go/internal/base"
1111
"cmd/go/internal/cfg"
1212
"cmd/go/internal/str"
13+
"cmd/internal/cov/covcmd"
1314
"context"
1415
"encoding/json"
1516
"fmt"
1617
"internal/coverage"
17-
"internal/coverage/covcmd"
1818
"io"
1919
"os"
2020
"path/filepath"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ package work
88

99
import (
1010
"bytes"
11+
"cmd/internal/cov/covcmd"
1112
"context"
1213
"crypto/sha256"
1314
"encoding/json"
1415
"errors"
1516
"fmt"
1617
"go/token"
17-
"internal/coverage/covcmd"
1818
"internal/lazyregexp"
1919
"io"
2020
"io/fs"

src/go/build/deps_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ var depsRules = `
625625
< internal/coverage/cformat;
626626
627627
internal/coverage, crypto/sha256, FMT
628-
< internal/coverage/covcmd;
628+
< cmd/internal/cov/covcmd;
629629
630630
encoding/json,
631631
runtime/debug,

0 commit comments

Comments
 (0)