From 84fe1b9a905e35464967b55379f306b473e4315d Mon Sep 17 00:00:00 2001 From: Noam Dolovich Date: Tue, 14 May 2024 13:37:22 +0300 Subject: [PATCH] internal: remove some deprecated type/method usages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some usages of the following deprecated types and methods are replaced by their non-deprecated equivalents: - cue.Runtime - Value.Lookup - ast.Node.AddComment Updates #2480. Signed-off-by: Noam Dolovich Change-Id: I501fbdc518b3edf122ec13b751502f15e2372244 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1194692 Unity-Result: CUE porcuepine Reviewed-by: Daniel Martí TryBot-Result: CUEcueckoo --- internal/core/dep/dep_test.go | 10 +++++----- internal/core/export/export_test.go | 7 ++++--- internal/task/task.go | 8 ++++---- internal/third_party/yaml/decode.go | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/internal/core/dep/dep_test.go b/internal/core/dep/dep_test.go index e6aa79c16c3..b7dde6c5adf 100644 --- a/internal/core/dep/dep_test.go +++ b/internal/core/dep/dep_test.go @@ -22,6 +22,7 @@ import ( "text/tabwriter" "cuelang.org/go/cue" + "cuelang.org/go/cue/cuecontext" "cuelang.org/go/cue/format" "cuelang.org/go/internal/core/adt" "cuelang.org/go/internal/core/debug" @@ -130,15 +131,14 @@ func TestX(t *testing.T) { t.Skip() } - rt := cue.Runtime{} - inst, err := rt.Compile("", in) - if err != nil { + v := cuecontext.New().CompileString(in) + if err := v.Err(); err != nil { t.Fatal(err) } - v := inst.Lookup("a") + aVal := v.LookupPath(cue.MakePath(cue.Str("a"))) - r, n := value.ToInternal(v) + r, n := value.ToInternal(aVal) ctxt := eval.NewContext(r, n) diff --git a/internal/core/export/export_test.go b/internal/core/export/export_test.go index 7ca40a44a8e..212c306030b 100644 --- a/internal/core/export/export_test.go +++ b/internal/core/export/export_test.go @@ -17,6 +17,8 @@ package export_test import ( "testing" + "golang.org/x/tools/txtar" + "cuelang.org/go/cue" "cuelang.org/go/cue/ast" "cuelang.org/go/cue/cuecontext" @@ -34,7 +36,6 @@ import ( "cuelang.org/go/internal/cuetdtest" "cuelang.org/go/internal/cuetxtar" "cuelang.org/go/internal/value" - "golang.org/x/tools/txtar" ) func TestDefinition(t *testing.T) { @@ -310,8 +311,8 @@ func TestFromGo(t *testing.T) { A: "a", B: "b", } - var r cue.Runtime - codec := gocodec.New(&r, nil) + ctx := cuecontext.New() + codec := gocodec.New(ctx, nil) v, err := codec.Decode(m) if err != nil { panic(err) diff --git a/internal/task/task.go b/internal/task/task.go index 9131baa7da7..78885d328c0 100644 --- a/internal/task/task.go +++ b/internal/task/task.go @@ -39,7 +39,7 @@ type Context struct { } func (c *Context) Lookup(field string) cue.Value { - f := c.Obj.Lookup(field) + f := c.Obj.LookupPath(cue.MakePath(cue.Str(field))) if !f.Exists() { c.addErr(f, nil, "could not find field %q", field) return cue.Value{} @@ -51,7 +51,7 @@ func (c *Context) Lookup(field string) cue.Value { } func (c *Context) Int64(field string) int64 { - f := c.Obj.Lookup(field) + f := c.Obj.LookupPath(cue.MakePath(cue.Str(field))) value, err := f.Int64() if err != nil { c.addErr(f, err, "invalid integer argument") @@ -61,7 +61,7 @@ func (c *Context) Int64(field string) int64 { } func (c *Context) String(field string) string { - f := c.Obj.Lookup(field) + f := c.Obj.LookupPath(cue.MakePath(cue.Str(field))) value, err := f.String() if err != nil { c.addErr(f, err, "invalid string argument") @@ -71,7 +71,7 @@ func (c *Context) String(field string) string { } func (c *Context) Bytes(field string) []byte { - f := c.Obj.Lookup(field) + f := c.Obj.LookupPath(cue.MakePath(cue.Str(field))) value, err := f.Bytes() if err != nil { c.addErr(f, err, "invalid bytes argument") diff --git a/internal/third_party/yaml/decode.go b/internal/third_party/yaml/decode.go index ed3737258f7..290e77f6cfd 100644 --- a/internal/third_party/yaml/decode.go +++ b/internal/third_party/yaml/decode.go @@ -299,7 +299,7 @@ func (d *decoder) attachDocComments(m yaml_mark_t, pos int8, expr ast.Node) { line = c.mark.line } if len(comments) > 0 { - expr.AddComment(&ast.CommentGroup{ + ast.AddComment(expr, &ast.CommentGroup{ Doc: pos == 0 && line+1 == m.line, Position: pos, List: comments, @@ -317,7 +317,7 @@ func (d *decoder) attachLineComment(m yaml_mark_t, pos int8, expr ast.Node) { Slash: d.pos(c.mark), Text: "//" + c.text[1:], } - expr.AddComment(&ast.CommentGroup{ + ast.AddComment(expr, &ast.CommentGroup{ Line: true, Position: pos, List: []*ast.Comment{comment},