qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-23 07:23:18 -06:00
Code Releases Activity

types2, go/types: use slices.SortFunc

Browse Source 
Now that we're bootstrapping from a toolchain that has the slices
package.

Updates #64751

Change-Id: I3227e55f87e033dae63a2d1712b7f9373fe49731
Reviewed-on: https://go-review.googlesource.com/c/go/+/610603
Reviewed-by: Robert Griesemer <gri@google.com>
Auto-Submit: Cuong Manh Le <cuong.manhle.vn@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Robert Findley <rfindley@google.com>
This commit is contained in:
Cuong Manh Le 2024-09-05 01:18:10 +07:00 committed by Robert Griesemer
parent 2707d42966
commit 73fa90e290
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cmd/compile/internal/types2/initorder.go
View File

@ -5,10 +5,11 @@
package types2
import (
"cmp"
"container/heap"
"fmt"
. "internal/types/errors"
"sort"
"slices"
)
// initOrder computes the Info.InitOrder for package variables.
@ -257,8 +258,8 @@ func dependencyGraph(objMap map[Object]*declInfo) []*graphNode {
// throughout the function graph, the cost of removing a function at
// position X is proportional to cost * (len(funcG)-X). Therefore, we should
// remove high-cost functions last.
sort.Slice(funcG, func(i, j int) bool {
return funcG[i].cost() < funcG[j].cost()
slices.SortFunc(funcG, func(a, b *graphNode) int {
return cmp.Compare(a.cost(), b.cost())
})
for _, n := range funcG {
// connect each predecessor p of n with each successor s

6
src/cmd/compile/internal/types2/stmt.go
View File

@ -11,7 +11,7 @@ import (
"go/constant"
"internal/buildcfg"
. "internal/types/errors"
"sort"
"slices"
)
func (check *Checker) funcBody(decl *declInfo, name string, sig *Signature, body *syntax.BlockStmt, iota constant.Value) {
@ -60,8 +60,8 @@ func (check *Checker) usage(scope *Scope) {
unused = append(unused, v)
}
}
sort.Slice(unused, func(i, j int) bool {
return cmpPos(unused[i].pos, unused[j].pos) < 0
slices.SortFunc(unused, func(a, b *Var) int {
return cmpPos(a.pos, b.pos)
})
for _, v := range unused {
check.softErrorf(v.pos, UnusedVar, "declared and not used: %s", v.name)

7
src/go/types/initorder.go
View File

@ -8,10 +8,11 @@
package types
import (
"cmp"
"container/heap"
"fmt"
. "internal/types/errors"
"sort"
"slices"
)
// initOrder computes the Info.InitOrder for package variables.
@ -260,8 +261,8 @@ func dependencyGraph(objMap map[Object]*declInfo) []*graphNode {
// throughout the function graph, the cost of removing a function at
// position X is proportional to cost * (len(funcG)-X). Therefore, we should
// remove high-cost functions last.
sort.Slice(funcG, func(i, j int) bool {
return funcG[i].cost() < funcG[j].cost()
slices.SortFunc(funcG, func(a, b *graphNode) int {
return cmp.Compare(a.cost(), b.cost())
})
for _, n := range funcG {
// connect each predecessor p of n with each successor s

6
src/go/types/stmt.go
View File

@ -12,7 +12,7 @@ import (
"go/token"
"internal/buildcfg"
. "internal/types/errors"
"sort"
"slices"
)
func (check *Checker) funcBody(decl *declInfo, name string, sig *Signature, body *ast.BlockStmt, iota constant.Value) {
@ -61,8 +61,8 @@ func (check *Checker) usage(scope *Scope) {
unused = append(unused, v)
}
}
sort.Slice(unused, func(i, j int) bool {
return cmpPos(unused[i].pos, unused[j].pos) < 0
slices.SortFunc(unused, func(a, b *Var) int {
return cmpPos(a.pos, b.pos)
})
for _, v := range unused {
check.softErrorf(v, UnusedVar, "declared and not used: %s", v.name)