aboutsummaryrefslogtreecommitdiff
path: root/src/internal/coverage
diff options
context:
space:
mode:
Diffstat (limited to 'src/internal/coverage')
-rw-r--r--src/internal/coverage/cformat/format.go16
-rw-r--r--src/internal/coverage/encodecounter/encode.go7
2 files changed, 5 insertions, 18 deletions
diff --git a/src/internal/coverage/cformat/format.go b/src/internal/coverage/cformat/format.go
index 0f9e981df8..4df0e70b81 100644
--- a/src/internal/coverage/cformat/format.go
+++ b/src/internal/coverage/cformat/format.go
@@ -36,6 +36,7 @@ import (
"internal/coverage"
"internal/coverage/cmerge"
"io"
+ "maps"
"slices"
"strings"
"text/tabwriter"
@@ -174,12 +175,7 @@ func (fm *Formatter) EmitTextual(w io.Writer) error {
if _, err := fmt.Fprintf(w, "mode: %s\n", fm.cm.String()); err != nil {
return err
}
- pkgs := make([]string, 0, len(fm.pm))
- for importpath := range fm.pm {
- pkgs = append(pkgs, importpath)
- }
- slices.Sort(pkgs)
- for _, importpath := range pkgs {
+ for _, importpath := range slices.Sorted(maps.Keys(fm.pm)) {
p := fm.pm[importpath]
units := make([]extcu, 0, len(p.unitTable))
for u := range p.unitTable {
@@ -281,14 +277,8 @@ func (fm *Formatter) EmitFuncs(w io.Writer) error {
allStmts := uint64(0)
covStmts := uint64(0)
- pkgs := make([]string, 0, len(fm.pm))
- for importpath := range fm.pm {
- pkgs = append(pkgs, importpath)
- }
- slices.Sort(pkgs)
-
// Emit functions for each package, sorted by import path.
- for _, importpath := range pkgs {
+ for _, importpath := range slices.Sorted(maps.Keys(fm.pm)) {
p := fm.pm[importpath]
if len(p.unitTable) == 0 {
continue
diff --git a/src/internal/coverage/encodecounter/encode.go b/src/internal/coverage/encodecounter/encode.go
index d50827014b..82fd328faf 100644
--- a/src/internal/coverage/encodecounter/encode.go
+++ b/src/internal/coverage/encodecounter/encode.go
@@ -13,6 +13,7 @@ import (
"internal/coverage/stringtab"
"internal/coverage/uleb128"
"io"
+ "maps"
"os"
"slices"
)
@@ -122,11 +123,7 @@ func (cfw *CoverageDataWriter) writeSegmentPreamble(args map[string]string, ws *
}
cfw.csh.StrTabLen = uint32(len(ws.BytesWritten())) - hdrsz
- akeys := make([]string, 0, len(args))
- for k := range args {
- akeys = append(akeys, k)
- }
- slices.Sort(akeys)
+ akeys := slices.Sorted(maps.Keys(args))
wrULEB128 := func(v uint) error {
cfw.tmp = cfw.tmp[:0]