diff --git a/container/value_test.go b/container/value_test.go index 4433670..77a4188 100644 --- a/container/value_test.go +++ b/container/value_test.go @@ -7,8 +7,6 @@ import ( "sync" "sync/atomic" "testing" - - "github.com/sunshineplan/utils" ) func TestValue(t *testing.T) { @@ -41,7 +39,7 @@ func TestPointType(t *testing.T) { if v := v.Load(); v != nil { t.Fatalf("wrong value: got %v, want nil", v) } - if old := v.Swap(utils.Ptr(1)); old != nil { + if old := v.Swap(new(1)); old != nil { t.Fatalf("wrong value: got %v, want nil", v) } } diff --git a/go.mod b/go.mod index 466e7d8..b137658 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module github.com/sunshineplan/utils -go 1.25 +go 1.26 diff --git a/ptr.go b/ptr.go deleted file mode 100644 index 645c64b..0000000 --- a/ptr.go +++ /dev/null @@ -1,3 +0,0 @@ -package utils - -func Ptr[T any](t T) *T { return &t } diff --git a/scheduler/schedule.go b/scheduler/schedule.go index 9dba746..6217493 100644 --- a/scheduler/schedule.go +++ b/scheduler/schedule.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - "github.com/sunshineplan/utils" "github.com/sunshineplan/utils/clock" ) @@ -223,7 +222,7 @@ func ISOWeekSchedule(year int, week int, weekday *time.Weekday, clock *Clock) Sc func Weekday(weekday ...time.Weekday) Schedule { var s multiSched for _, weekday := range weekday { - s = append(s, ISOWeekSchedule(0, 0, utils.Ptr(weekday), FullClock())) + s = append(s, ISOWeekSchedule(0, 0, new(weekday), FullClock())) } return s } diff --git a/scheduler/schedule_test.go b/scheduler/schedule_test.go index dc88b4f..79dfdb5 100644 --- a/scheduler/schedule_test.go +++ b/scheduler/schedule_test.go @@ -3,8 +3,6 @@ package scheduler import ( "testing" "time" - - "github.com/sunshineplan/utils" ) const format = "2006/01/02 15:04:05" @@ -70,25 +68,25 @@ func TestISOWeekScheduleNext(t *testing.T) { t string next string }{ - {ISOWeekSchedule(2000, 1, utils.Ptr(time.Monday), nil), "2000/01/03 12:00:00", "2000/01/03 12:00:01"}, - {ISOWeekSchedule(2000, 1, utils.Ptr(time.Monday), nil), "1900/12/15 12:00:00", "2000/01/03 00:00:00"}, - {ISOWeekSchedule(2000, 1, utils.Ptr(time.Monday), nil), "2000/01/15 12:00:00", "0001/01/01 00:00:00"}, + {ISOWeekSchedule(2000, 1, new(time.Monday), nil), "2000/01/03 12:00:00", "2000/01/03 12:00:01"}, + {ISOWeekSchedule(2000, 1, new(time.Monday), nil), "1900/12/15 12:00:00", "2000/01/03 00:00:00"}, + {ISOWeekSchedule(2000, 1, new(time.Monday), nil), "2000/01/15 12:00:00", "0001/01/01 00:00:00"}, - {ISOWeekSchedule(0, 1, utils.Ptr(time.Monday), nil), "2000/01/03 12:00:00", "2000/01/03 12:00:01"}, - {ISOWeekSchedule(0, 1, utils.Ptr(time.Monday), nil), "1900/12/15 12:00:00", "1900/12/31 00:00:00"}, - {ISOWeekSchedule(0, 1, utils.Ptr(time.Monday), nil), "2000/01/15 12:00:00", "2001/01/01 00:00:00"}, + {ISOWeekSchedule(0, 1, new(time.Monday), nil), "2000/01/03 12:00:00", "2000/01/03 12:00:01"}, + {ISOWeekSchedule(0, 1, new(time.Monday), nil), "1900/12/15 12:00:00", "1900/12/31 00:00:00"}, + {ISOWeekSchedule(0, 1, new(time.Monday), nil), "2000/01/15 12:00:00", "2001/01/01 00:00:00"}, - {ISOWeekSchedule(2000, 0, utils.Ptr(time.Monday), nil), "2000/01/03 12:00:00", "2000/01/03 12:00:01"}, - {ISOWeekSchedule(2000, 0, utils.Ptr(time.Monday), nil), "2000/01/01 12:00:00", "2000/01/03 00:00:00"}, - {ISOWeekSchedule(2000, 0, utils.Ptr(time.Monday), nil), "2000/01/05 12:00:00", "2000/01/10 00:00:00"}, + {ISOWeekSchedule(2000, 0, new(time.Monday), nil), "2000/01/03 12:00:00", "2000/01/03 12:00:01"}, + {ISOWeekSchedule(2000, 0, new(time.Monday), nil), "2000/01/01 12:00:00", "2000/01/03 00:00:00"}, + {ISOWeekSchedule(2000, 0, new(time.Monday), nil), "2000/01/05 12:00:00", "2000/01/10 00:00:00"}, {ISOWeekSchedule(2000, 1, nil, nil), "2000/01/03 12:00:00", "2000/01/03 12:00:01"}, {ISOWeekSchedule(2000, 1, nil, nil), "2000/01/02 12:00:00", "2000/01/03 00:00:00"}, {ISOWeekSchedule(2000, 1, nil, nil), "2000/01/10 12:00:00", "0001/01/01 00:00:00"}, - {ISOWeekSchedule(0, 0, utils.Ptr(time.Monday), nil), "2000/01/03 12:00:00", "2000/01/03 12:00:01"}, - {ISOWeekSchedule(0, 0, utils.Ptr(time.Monday), nil), "1900/12/15 12:00:00", "1900/12/17 00:00:00"}, - {ISOWeekSchedule(0, 0, utils.Ptr(time.Monday), nil), "2000/01/15 12:00:00", "2000/01/17 00:00:00"}, + {ISOWeekSchedule(0, 0, new(time.Monday), nil), "2000/01/03 12:00:00", "2000/01/03 12:00:01"}, + {ISOWeekSchedule(0, 0, new(time.Monday), nil), "1900/12/15 12:00:00", "1900/12/17 00:00:00"}, + {ISOWeekSchedule(0, 0, new(time.Monday), nil), "2000/01/15 12:00:00", "2000/01/17 00:00:00"}, {ISOWeekSchedule(2000, 0, nil, nil), "2000/01/03 12:00:00", "2000/01/03 12:00:01"}, {ISOWeekSchedule(2000, 0, nil, nil), "2000/01/01 12:00:00", "2000/01/03 00:00:00"},