Skip to content

Commit

Permalink
Revert "revert all changes to test before"
Browse files Browse the repository at this point in the history
This reverts commit 331654f.
  • Loading branch information
AriehSchneier committed Aug 26, 2024
1 parent 331654f commit 25cc431
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 109 deletions.
57 changes: 28 additions & 29 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,47 +6,46 @@ replace github.com/spf13/afero => github.com/anz-bank/afero v1.2.4

require (
github.com/anz-bank/pkg v0.0.48
github.com/arr-ai/frozen v0.20.1
github.com/arr-ai/hash v0.8.0
github.com/arr-ai/frozen v0.20.3
github.com/arr-ai/hash v1.1.0
github.com/arr-ai/proto v0.0.0-20180422074755-2ffbedebee50
github.com/arr-ai/wbnf v0.35.1
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
github.com/go-errors/errors v1.4.2
github.com/gorilla/websocket v1.4.2
github.com/iancoleman/strcase v0.2.0
github.com/mattn/go-isatty v0.0.16
github.com/arr-ai/wbnf v0.35.3
github.com/chzyer/readline v1.5.1
github.com/go-errors/errors v1.5.1
github.com/gorilla/websocket v1.5.3
github.com/iancoleman/strcase v0.3.0
github.com/mattn/go-isatty v0.0.20
github.com/pkg/errors v0.9.1
github.com/rjeczalik/notify v0.9.2
github.com/rjeczalik/notify v0.9.3
github.com/sethvargo/go-retry v0.1.0
github.com/sirupsen/logrus v1.9.0
github.com/spf13/afero v1.9.2
github.com/stretchr/testify v1.8.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/afero v1.11.0
github.com/stretchr/testify v1.9.0
github.com/urfave/cli/v2 v2.2.0
github.com/xuri/excelize/v2 v2.4.1
golang.org/x/text v0.3.7
google.golang.org/grpc v1.49.0
google.golang.org/protobuf v1.28.1
github.com/xuri/excelize/v2 v2.8.1
golang.org/x/text v0.17.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.34.2
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/chzyer/test v1.0.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-github/v32 v32.1.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/richardlehane/mscfb v1.0.3 // indirect
github.com/richardlehane/msoleps v1.0.1 // indirect
github.com/richardlehane/mscfb v1.0.4 // indirect
github.com/richardlehane/msoleps v1.0.3 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/xuri/efp v0.0.0-20210322160811-ab561f5b45e3 // indirect
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
golang.org/x/sys v0.0.0-20220907062415-87db552b00fd // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220902135211-223410557253 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sys v0.24.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
)
134 changes: 59 additions & 75 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion rel/value_set_true.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (TrueSet) Equal(i interface{}) bool {
}

func (TrueSet) Hash(seed uintptr) uintptr {
return seed ^ hash.Interface(EmptyTuple, 0)
return seed ^ hash.Any(EmptyTuple, 0)
}

func (t TrueSet) Eval(ctx context.Context, local Scope) (Value, error) {
Expand Down
4 changes: 2 additions & 2 deletions rel/value_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func TestNewValue(t *testing.T) {
NewAttr("zeroChild", NewTuple()),
NewAttr("newName", None),
NewAttr("none", None),
NewAttr("cASE", NewNumber(0)),
NewAttr("case", NewNumber(0)),
NewAttr("mixedMap", MustNewDict(false,
NewDictEntryTuple(NewNumber(1), NewNumber(2)),
NewDictEntryTuple(NewString([]rune("k")), None),
Expand All @@ -151,7 +151,7 @@ func TestNewValue(t *testing.T) {
NewAttr("zeroChild", NewTuple()),
NewAttr("newName", None),
NewAttr("none", None),
NewAttr("cASE", NewNumber(0)),
NewAttr("case", NewNumber(0)),
NewAttr("mixedMap", None),
NewAttr("stringMap", NewTuple()),
NewAttr("children", None),
Expand Down
4 changes: 2 additions & 2 deletions rel/value_values.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (v Values) equalValues(v2 Values) bool {
func (v Values) Hash(seed uintptr) uintptr {
h := seed
for _, val := range v {
h = hash.Interface(val, h)
h = hash.Any(val, h)
}
return h
}
Expand Down Expand Up @@ -211,7 +211,7 @@ func (pv projectedValues) Format(f fmt.State, verb rune) {
func (pv projectedValues) Hash(seed uintptr) uintptr {
h := seed
for _, i := range pv.p {
h = hash.Interface(pv.v[i], h)
h = hash.Any(pv.v[i], h)
}
return h
}
Expand Down
Binary file modified syntax/embed/stdlib-safe.arraiz
Binary file not shown.
Binary file modified syntax/embed/stdlib-unsafe.arraiz
Binary file not shown.

0 comments on commit 25cc431

Please sign in to comment.