Skip to content

Commit 3b3b17a

Browse files
committed
πŸ’©πŸ‘Œ make lint happy
1 parent 4d7b783 commit 3b3b17a

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

β€Ž.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
linters-settings:
22
errcheck:
3-
exclude-functions: ["fmt:.*"]
43
ignoretests: true
54

65
goimports:

β€Žplugin/moyu/holiday_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,31 @@ func TestSetHoliday(t *testing.T) {
2323
t.Fatal(err)
2424
}
2525

26-
err = SetHoliday("ε…ƒζ—¦", 1, 2024, 1, 1)
26+
err = SetHoliday("ε…ƒζ—¦", 1, 2025, 1, 1)
2727
if err != nil {
2828
t.Fatal(err)
2929
}
30-
err = SetHoliday("ζ˜₯θŠ‚", 7, 2024, 2, 10)
30+
err = SetHoliday("ζ˜₯θŠ‚", 7, 2025, 1, 29)
3131
if err != nil {
3232
t.Fatal(err)
3333
}
34-
err = SetHoliday("ζΈ…ζ˜ŽθŠ‚", 1, 2024, 4, 5)
34+
err = SetHoliday("ζΈ…ζ˜ŽθŠ‚", 1, 2025, 4, 4)
3535
if err != nil {
3636
t.Fatal(err)
3737
}
38-
err = SetHoliday("εŠ³εŠ¨θŠ‚", 1, 2024, 5, 1)
38+
err = SetHoliday("εŠ³εŠ¨θŠ‚", 1, 2025, 5, 1)
3939
if err != nil {
4040
t.Fatal(err)
4141
}
42-
err = SetHoliday("η«―εˆθŠ‚", 1, 2023, 6, 10)
42+
err = SetHoliday("η«―εˆθŠ‚", 3, 2024, 6, 8)
4343
if err != nil {
4444
t.Fatal(err)
4545
}
46-
err = SetHoliday("δΈ­η§‹θŠ‚", 2, 2023, 9, 29)
46+
err = SetHoliday("δΈ­η§‹θŠ‚", 3, 2024, 9, 15)
4747
if err != nil {
4848
t.Fatal(err)
4949
}
50-
err = SetHoliday("ε›½εΊ†θŠ‚", 6, 2023, 10, 1)
50+
err = SetHoliday("ε›½εΊ†θŠ‚", 7, 2024, 10, 1)
5151
if err != nil {
5252
t.Fatal(err)
5353
}

β€Žplugin/moyu/nowork.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ func GetHoliday(name string) *Holiday {
3232
if err != nil {
3333
return NewHoliday(name+err.Error(), 0, 0, 0, 0)
3434
}
35-
fmt.Sscanf(ret, "%d_%d_%d_%d", &dur, &year, &month, &day)
35+
_, err = fmt.Sscanf(ret, "%d_%d_%d_%d", &dur, &year, &month, &day)
36+
if err != nil {
37+
return NewHoliday(name+err.Error(), 0, 0, 0, 0)
38+
}
3639
logrus.Debugln("[moyu]θŽ·ε–θŠ‚ζ—₯:", name, dur, year, month, day)
3740
return NewHoliday(name, dur, year, month, day)
3841
}

0 commit comments

Comments
Β (0)