Skip to content

Commit 0258583

Browse files
committed
all: merge master (b5a64bb) into gopls-release-branch.0.18
Also add back the replace directive. For golang/go#71607 Conflicts: - gopls/go.mod - gopls/go.sum Merge List: + 2025-02-12 b5a64bb go/analysis/internal/checker: be silent with -fix + 2025-02-11 b752317 internal/analysisinternal: disable AddImport test without go command + 2025-02-11 d98774e cmd/signature-fuzzer/internal/fuzz-generator: update to math/rand/v2 + 2025-02-11 2593262 gopls/internal/telemetry/cmd/stacks: remove leading \b match + 2025-02-11 b3c5d10 gopls: record telemetry counters for settings that are used + 2025-02-11 d2585c4 gopls/internal/golang: folding range: remove FoldingRangeInfo + 2025-02-11 0d16805 internal/stdlib: update stdlib index for Go 1.24.0 + 2025-02-11 027eab5 go/analysis/analysistest: RunWithSuggestedFix: 3-way merge + 2025-02-10 f61b225 internal/analysisinternal: AddImport puts new import in a group + 2025-02-10 91bac86 internal/analysisinternal: add CanImport + 2025-02-10 94c41d3 gopls/internal/golang: add comment about SymbolKind + 2025-02-10 09747cd go.mod: update golang.org/x dependencies + 2025-02-10 dc9353b gopls/internal/analysis/modernize: appendclipped: unclip + 2025-02-07 a886a1c internal/analysisinternal: AddImport handles dot imports + 2025-02-07 94c3c49 go/analysis/analysistest: RunWithSuggestedFix: assume valid fixes + 2025-02-07 5f9967d gopls/internal/analysis/modernize: strings.Split -> SplitSeq + 2025-02-07 a1eb5fd go/analysis/passes/framepointer: support arm64 + 2025-02-07 9c087d9 internal/analysis/gofix: change "forward" back to "inline" + 2025-02-07 82317ce gopls/internal/analysis/modernize: slices.Delete: import slices Change-Id: I5e21f982437cd4288f71b00484fa589ddcab8df6
2 parents 2f3699f + b5a64bb commit 0258583

Some content is hidden

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

67 files changed

+1460
-650
lines changed

cmd/signature-fuzzer/internal/fuzz-generator/wraprand.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package generator
66

77
import (
88
"fmt"
9-
"math/rand"
9+
"math/rand/v2"
1010
"os"
1111
"runtime"
1212
"strings"
@@ -20,8 +20,7 @@ const (
2020
)
2121

2222
func NewWrapRand(seed int64, ctl int) *wraprand {
23-
rand.Seed(seed)
24-
return &wraprand{seed: seed, ctl: ctl}
23+
return &wraprand{seed: seed, ctl: ctl, rand: rand.New(rand.NewPCG(0, uint64(seed)))}
2524
}
2625

2726
type wraprand struct {
@@ -32,6 +31,7 @@ type wraprand struct {
3231
tag string
3332
calls []string
3433
ctl int
34+
rand *rand.Rand
3535
}
3636

3737
func (w *wraprand) captureCall(tag string, val string) {
@@ -59,7 +59,7 @@ func (w *wraprand) captureCall(tag string, val string) {
5959

6060
func (w *wraprand) Intn(n int64) int64 {
6161
w.intncalls++
62-
rv := rand.Int63n(n)
62+
rv := w.rand.Int64N(n)
6363
if w.ctl&RandCtlCapture != 0 {
6464
w.captureCall("Intn", fmt.Sprintf("%d", rv))
6565
}
@@ -68,7 +68,7 @@ func (w *wraprand) Intn(n int64) int64 {
6868

6969
func (w *wraprand) Float32() float32 {
7070
w.f32calls++
71-
rv := rand.Float32()
71+
rv := w.rand.Float32()
7272
if w.ctl&RandCtlCapture != 0 {
7373
w.captureCall("Float32", fmt.Sprintf("%f", rv))
7474
}
@@ -77,15 +77,15 @@ func (w *wraprand) Float32() float32 {
7777

7878
func (w *wraprand) NormFloat64() float64 {
7979
w.f64calls++
80-
rv := rand.NormFloat64()
80+
rv := w.rand.NormFloat64()
8181
if w.ctl&RandCtlCapture != 0 {
8282
w.captureCall("NormFloat64", fmt.Sprintf("%f", rv))
8383
}
8484
return rv
8585
}
8686

8787
func (w *wraprand) emitCalls(fn string) {
88-
outf, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
88+
outf, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o666)
8989
if err != nil {
9090
panic(err)
9191
}

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ go 1.22.0 // => default GODEBUG has gotypesalias=0
55
require (
66
github.com/google/go-cmp v0.6.0
77
github.com/yuin/goldmark v1.4.13
8-
golang.org/x/mod v0.22.0
9-
golang.org/x/net v0.34.0
10-
golang.org/x/sync v0.10.0
8+
golang.org/x/mod v0.23.0
9+
golang.org/x/net v0.35.0
10+
golang.org/x/sync v0.11.0
1111
golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457
1212
)
1313

14-
require golang.org/x/sys v0.29.0 // indirect
14+
require golang.org/x/sys v0.30.0 // indirect

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
22
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
33
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
44
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
5-
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
6-
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
7-
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
8-
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
9-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
10-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
11-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
12-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
5+
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
6+
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
7+
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
8+
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
9+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
10+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
11+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
12+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1313
golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 h1:zf5N6UOrA487eEFacMePxjXAJctxKmyjKUsjA11Uzuk=
1414
golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=

0 commit comments

Comments
 (0)