Skip to content

Commit 9bc1825

Browse files
adonovangopherbot
adonovan
authored and
gopherbot
committed
go/analysis/passes/internal/analysisutil: delete package
- move ReadFile into analysisinternal - eliminate LineStart, redundant since go1.12 Change-Id: I5af5b278ae9108da9b2b20166a5c509fc9eac853 Reviewed-on: https://go-review.googlesource.com/c/tools/+/711440 Auto-Submit: Alan Donovan <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Peter Weinberger <[email protected]>
1 parent 47123ba commit 9bc1825

File tree

33 files changed

+80
-130
lines changed

33 files changed

+80
-130
lines changed

‎go/analysis/passes/appends/appends.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ import (
1313

1414
"golang.org/x/tools/go/analysis"
1515
"golang.org/x/tools/go/analysis/passes/inspect"
16-
"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
1716
"golang.org/x/tools/go/ast/inspector"
1817
"golang.org/x/tools/go/types/typeutil"
18+
"golang.org/x/tools/internal/analysisinternal"
1919
)
2020

2121
//go:embed doc.go
2222
var doc string
2323

2424
var Analyzer = &analysis.Analyzer{
2525
Name: "appends",
26-
Doc: analysisutil.MustExtractDoc(doc, "appends"),
26+
Doc: analysisinternal.MustExtractDoc(doc, "appends"),
2727
URL: "https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/appends",
2828
Requires: []*analysis.Analyzer{inspect.Analyzer},
2929
Run: run,

‎go/analysis/passes/asmdecl/asmdecl.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"strings"
2020

2121
"golang.org/x/tools/go/analysis"
22-
"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
22+
"golang.org/x/tools/internal/analysisinternal"
2323
)
2424

2525
const Doc = "report mismatches between assembly files and Go declarations"
@@ -175,7 +175,7 @@ func run(pass *analysis.Pass) (any, error) {
175175

176176
Files:
177177
for _, fname := range sfiles {
178-
content, tf, err := analysisutil.ReadFile(pass, fname)
178+
content, tf, err := analysisinternal.ReadFile(pass, fname)
179179
if err != nil {
180180
return nil, err
181181
}
@@ -211,7 +211,7 @@ Files:
211211
resultStr = "result register"
212212
}
213213
for _, line := range retLine {
214-
pass.Reportf(analysisutil.LineStart(tf, line), "[%s] %s: RET without writing to %s", arch, fnName, resultStr)
214+
pass.Reportf(tf.LineStart(line), "[%s] %s: RET without writing to %s", arch, fnName, resultStr)
215215
}
216216
}
217217
retLine = nil
@@ -227,7 +227,7 @@ Files:
227227
lineno++
228228

229229
badf := func(format string, args ...any) {
230-
pass.Reportf(analysisutil.LineStart(tf, lineno), "[%s] %s: %s", arch, fnName, fmt.Sprintf(format, args...))
230+
pass.Reportf(tf.LineStart(lineno), "[%s] %s: %s", arch, fnName, fmt.Sprintf(format, args...))
231231
}
232232

233233
if arch == "" {

‎go/analysis/passes/assign/assign.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717

1818
"golang.org/x/tools/go/analysis"
1919
"golang.org/x/tools/go/analysis/passes/inspect"
20-
"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
2120
"golang.org/x/tools/go/ast/inspector"
21+
"golang.org/x/tools/internal/analysisinternal"
2222
"golang.org/x/tools/internal/astutil"
2323
"golang.org/x/tools/internal/refactor"
2424
"golang.org/x/tools/internal/typesinternal"
@@ -29,7 +29,7 @@ var doc string
2929

3030
var Analyzer = &analysis.Analyzer{
3131
Name: "assign",
32-
Doc: analysisutil.MustExtractDoc(doc, "assign"),
32+
Doc: analysisinternal.MustExtractDoc(doc, "assign"),
3333
URL: "https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/assign",
3434
Requires: []*analysis.Analyzer{inspect.Analyzer},
3535
Run: run,

‎go/analysis/passes/atomic/atomic.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111

1212
"golang.org/x/tools/go/analysis"
1313
"golang.org/x/tools/go/analysis/passes/inspect"
14-
"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
1514
"golang.org/x/tools/go/ast/inspector"
1615
"golang.org/x/tools/go/types/typeutil"
16+
"golang.org/x/tools/internal/analysisinternal"
1717
"golang.org/x/tools/internal/astutil"
1818
"golang.org/x/tools/internal/typesinternal"
1919
)
@@ -23,7 +23,7 @@ var doc string
2323

2424
var Analyzer = &analysis.Analyzer{
2525
Name: "atomic",
26-
Doc: analysisutil.MustExtractDoc(doc, "atomic"),
26+
Doc: analysisinternal.MustExtractDoc(doc, "atomic"),
2727
URL: "https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/atomic",
2828
Requires: []*analysis.Analyzer{inspect.Analyzer},
2929
RunDespiteErrors: true,

‎go/analysis/passes/buildtag/buildtag.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"unicode"
1515

1616
"golang.org/x/tools/go/analysis"
17-
"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
17+
"golang.org/x/tools/internal/analysisinternal"
1818
)
1919

2020
const Doc = "check //go:build and // +build directives"
@@ -86,7 +86,7 @@ func checkOtherFile(pass *analysis.Pass, filename string) error {
8686

8787
// We cannot use the Go parser, since this may not be a Go source file.
8888
// Read the raw bytes instead.
89-
content, tf, err := analysisutil.ReadFile(pass, filename)
89+
content, tf, err := analysisinternal.ReadFile(pass, filename)
9090
if err != nil {
9191
return err
9292
}

‎go/analysis/passes/defers/defers.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

1111
"golang.org/x/tools/go/analysis"
1212
"golang.org/x/tools/go/analysis/passes/inspect"
13-
"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
1413
"golang.org/x/tools/go/ast/inspector"
1514
"golang.org/x/tools/go/types/typeutil"
15+
"golang.org/x/tools/internal/analysisinternal"
1616
"golang.org/x/tools/internal/typesinternal"
1717
)
1818

@@ -23,8 +23,8 @@ var doc string
2323
var Analyzer = &analysis.Analyzer{
2424
Name: "defers",
2525
Requires: []*analysis.Analyzer{inspect.Analyzer},
26+
Doc: analysisinternal.MustExtractDoc(doc, "defers"),
2627
URL: "https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/defers",
27-
Doc: analysisutil.MustExtractDoc(doc, "defers"),
2828
Run: run,
2929
}
3030

‎go/analysis/passes/directive/directive.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"unicode/utf8"
1515

1616
"golang.org/x/tools/go/analysis"
17-
"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
17+
"golang.org/x/tools/internal/analysisinternal"
1818
)
1919

2020
const Doc = `check Go toolchain directives such as //go:debug
@@ -86,7 +86,7 @@ func checkGoFile(pass *analysis.Pass, f *ast.File) {
8686
func checkOtherFile(pass *analysis.Pass, filename string) error {
8787
// We cannot use the Go parser, since is not a Go source file.
8888
// Read the raw bytes instead.
89-
content, tf, err := analysisutil.ReadFile(pass, filename)
89+
content, tf, err := analysisinternal.ReadFile(pass, filename)
9090
if err != nil {
9191
return err
9292
}

‎go/analysis/passes/framepointer/framepointer.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"unicode"
1414

1515
"golang.org/x/tools/go/analysis"
16-
"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
16+
"golang.org/x/tools/internal/analysisinternal"
1717
)
1818

1919
const Doc = "report assembly that clobbers the frame pointer before saving it"
@@ -98,7 +98,7 @@ func run(pass *analysis.Pass) (any, error) {
9898
}
9999

100100
for _, fname := range sfiles {
101-
content, tf, err := analysisutil.ReadFile(pass, fname)
101+
content, tf, err := analysisinternal.ReadFile(pass, fname)
102102
if err != nil {
103103
return nil, err
104104
}
@@ -127,7 +127,7 @@ func run(pass *analysis.Pass) (any, error) {
127127
}
128128

129129
if arch.isFPWrite(line) {
130-
pass.Reportf(analysisutil.LineStart(tf, lineno), "frame pointer is clobbered before saving")
130+
pass.Reportf(tf.LineStart(lineno), "frame pointer is clobbered before saving")
131131
active = false
132132
continue
133133
}

‎go/analysis/passes/ifaceassert/ifaceassert.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111

1212
"golang.org/x/tools/go/analysis"
1313
"golang.org/x/tools/go/analysis/passes/inspect"
14-
"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
1514
"golang.org/x/tools/go/ast/inspector"
15+
"golang.org/x/tools/internal/analysisinternal"
1616
"golang.org/x/tools/internal/typeparams"
1717
)
1818

@@ -21,7 +21,7 @@ var doc string
2121

2222
var Analyzer = &analysis.Analyzer{
2323
Name: "ifaceassert",
24-
Doc: analysisutil.MustExtractDoc(doc, "ifaceassert"),
24+
Doc: analysisinternal.MustExtractDoc(doc, "ifaceassert"),
2525
URL: "https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/ifaceassert",
2626
Requires: []*analysis.Analyzer{inspect.Analyzer},
2727
Run: run,

‎go/analysis/passes/internal/analysisutil/util.go‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)