Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions container/value_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import (
"sync"
"sync/atomic"
"testing"

"github.com/sunshineplan/utils"
)

func TestValue(t *testing.T) {
Expand Down Expand Up @@ -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)
}
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/sunshineplan/utils

go 1.25
go 1.26
3 changes: 0 additions & 3 deletions ptr.go

This file was deleted.

3 changes: 1 addition & 2 deletions scheduler/schedule.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"fmt"
"time"

"github.com/sunshineplan/utils"
"github.com/sunshineplan/utils/clock"
)

Expand Down Expand Up @@ -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
}
Expand Down
26 changes: 12 additions & 14 deletions scheduler/schedule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package scheduler
import (
"testing"
"time"

"github.com/sunshineplan/utils"
)

const format = "2006/01/02 15:04:05"
Expand Down Expand Up @@ -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"},
Expand Down
Loading