Skip to content

Commit c561d44

Browse files
Mark os consts as deprecated (#88)
Mark os consts as deprecated
1 parent 20cf01f commit c561d44

File tree

12 files changed

+15
-247
lines changed

12 files changed

+15
-247
lines changed

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [ main ]
88

99
env:
10-
GO_VERSION: 1.19.2
10+
GO_VERSION: 1.19.4
1111

1212
jobs:
1313
run:

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ module github.com/sashamelentyev/usestdlibvars
22

33
go 1.19
44

5-
require golang.org/x/tools v0.1.12
5+
require golang.org/x/tools v0.5.0
66

77
require (
8-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
9-
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
8+
golang.org/x/mod v0.7.0 // indirect
9+
golang.org/x/sys v0.4.0 // indirect
1010
)

go.sum

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
2-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
3-
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
4-
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5-
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
6-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
1+
golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
2+
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
3+
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
4+
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
5+
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6+
golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
7+
golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=

pkg/analyzer/analyzer.go

+4-16
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ func flags() flag.FlagSet {
4848
flags.Bool(TimeLayoutFlag, false, "suggest the use of time.Layout")
4949
flags.Bool(CryptoHashFlag, false, "suggest the use of crypto.Hash.String()")
5050
flags.Bool(RPCDefaultPathFlag, false, "suggest the use of rpc.DefaultXXPath")
51-
flags.Bool(OSDevNullFlag, false, "suggest the use of os.DevNull")
51+
flags.Bool(OSDevNullFlag, false, "[DEPRECATED] suggest the use of os.DevNull")
5252
flags.Bool(SQLIsolationLevelFlag, false, "suggest the use of sql.LevelXX.String()")
5353
flags.Bool(TLSSignatureSchemeFlag, false, "suggest the use of tls.SignatureScheme.String()")
5454
flags.Bool(ConstantKindFlag, false, "suggest the use of constant.Kind.String()")
55-
flags.Bool(SyslogPriorityFlag, false, "suggest the use of syslog.Priority")
55+
flags.Bool(SyslogPriorityFlag, false, "[DEPRECATED] suggest the use of syslog.Priority")
5656
return *flags
5757
}
5858

@@ -461,13 +461,7 @@ func checkRPCDefaultPath(pass *analysis.Pass, basicLit *ast.BasicLit) {
461461
}
462462
}
463463

464-
func checkOSDevNull(pass *analysis.Pass, basicLit *ast.BasicLit) {
465-
currentVal := getBasicLitValue(basicLit)
466-
467-
if newVal, ok := mapping.OSDevNull[currentVal]; ok {
468-
report(pass, basicLit.Pos(), currentVal, newVal)
469-
}
470-
}
464+
func checkOSDevNull(pass *analysis.Pass, basicLit *ast.BasicLit) {}
471465

472466
func checkSQLIsolationLevel(pass *analysis.Pass, basicLit *ast.BasicLit) {
473467
currentVal := getBasicLitValue(basicLit)
@@ -493,13 +487,7 @@ func checkConstantKind(pass *analysis.Pass, basicLit *ast.BasicLit) {
493487
}
494488
}
495489

496-
func checkSyslogPriority(pass *analysis.Pass, basicLit *ast.BasicLit) {
497-
currentVal := getBasicLitValue(basicLit)
498-
499-
if newVal, ok := mapping.SyslogPriority[currentVal]; ok {
500-
report(pass, basicLit.Pos(), currentVal, newVal)
501-
}
502-
}
490+
func checkSyslogPriority(pass *analysis.Pass, basicLit *ast.BasicLit) {}
503491

504492
// getBasicLitFromArgs gets the *ast.BasicLit of a function argument.
505493
//

pkg/analyzer/internal/gen.go

-12
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@ func main() {
8383
templateName: "test-issue32.go.tmpl",
8484
fileName: "pkg/analyzer/testdata/src/a/http/issue32.go",
8585
},
86-
{
87-
mapping: mapping.OSDevNull,
88-
packageName: "os_test",
89-
templateName: "test-template.go.tmpl",
90-
fileName: "pkg/analyzer/testdata/src/a/os/devnull.go",
91-
},
9286
{
9387
mapping: mapping.SQLIsolationLevel,
9488
packageName: "sql_test",
@@ -107,12 +101,6 @@ func main() {
107101
templateName: "test-template.go.tmpl",
108102
fileName: "pkg/analyzer/testdata/src/a/constant/kind.go",
109103
},
110-
{
111-
mapping: mapping.SyslogPriority,
112-
packageName: "syslog_test",
113-
templateName: "test-syslog.go.tmpl",
114-
fileName: "pkg/analyzer/testdata/src/a/syslog/priority.go",
115-
},
116104
}
117105

118106
for _, operation := range operations {

pkg/analyzer/internal/mapping/mapping.go

-4
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ var TimeLayout = map[string]string{
163163
time.StampNano: "time.StampNano",
164164
}
165165

166-
var OSDevNull = map[string]string{}
167-
168166
var SQLIsolationLevel = map[string]string{
169167
// sql.LevelDefault.String(): "sql.LevelDefault.String()",
170168
sql.LevelReadUncommitted.String(): "sql.LevelReadUncommitted.String()",
@@ -199,5 +197,3 @@ var ConstantKind = map[string]string{
199197
constant.Float.String(): "constant.Float.String()",
200198
constant.Complex.String(): "constant.Complex.String()",
201199
}
202-
203-
var SyslogPriority = map[string]string{}

pkg/analyzer/internal/mapping/osdevnull.go

-9
This file was deleted.

pkg/analyzer/internal/mapping/syslogpriority.go

-40
This file was deleted.

pkg/analyzer/os_dev_test.go

-10
This file was deleted.

pkg/analyzer/syslog_priority_test.go

-10
This file was deleted.

pkg/analyzer/testdata/src/a/os/devnull.go

-15
This file was deleted.

pkg/analyzer/testdata/src/a/syslog/priority.go

-121
This file was deleted.

0 commit comments

Comments
 (0)