all: remove a few unused parameters spotted by unparam

While here, apply three other tiny cleanups suggested by gopls:
remove redundant returns and a redundant type in a declaration,
and remove an unused field.

Signed-off-by: Daniel Martí <[email protected]>
Change-Id: I93d5909fdb17c03d336e11b87667419b39e10d03
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1201759
Reviewed-by: Roger Peppe <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>

Author: mvdan

cue/errors.go

@@ -18,7 +18,6 @@ import (
 	"cuelang.org/go/cue/errors"
 	"cuelang.org/go/cue/token"
 	"cuelang.org/go/internal/core/adt"
-	"cuelang.org/go/internal/core/runtime"
 )
 
 func (v Value) toErr(b *adt.Bottom) (err errors.Error) {
@@ -96,7 +95,7 @@ var errNotExists = &adt.Bottom{
 	Err:       errors.Newf(token.NoPos, "undefined value"),
 }
 
-func mkErr(idx *runtime.Runtime, src adt.Node, args ...interface{}) *adt.Bottom {
+func mkErr(src adt.Node, args ...interface{}) *adt.Bottom {
 	var e *adt.Bottom
 	var code adt.ErrorCode = -1
 outer:

cue/load/loader_common.go

@@ -180,7 +180,6 @@ func (fp *fileProcessor) add(root string, file *build.File, mode importMode) {
 		fp.err = errors.Append(fp.err, err)
 		file.ExcludeReason = fp.err
 		p.InvalidFiles = append(p.InvalidFiles, file)
-		return
 	}
 	if err := setFileSource(fp.c, file); err != nil {
 		badFile(errors.Promote(err, ""))

cue/query.go

@@ -74,7 +74,7 @@ outer:
 		if err, ok := sel.sel.(pathError); ok {
 			x = &adt.Bottom{Err: err.Error}
 		} else {
-			x = mkErr(v.idx, n, adt.EvalError, "field not found: %v", sel.sel)
+			x = mkErr(n, adt.EvalError, "field not found: %v", sel.sel)
 			if n.Accept(ctx, f) {
 				x.Code = adt.IncompleteError
 			}

cue/types.go

@@ -127,7 +127,7 @@ func (o *hiddenStructValue) Lookup(key string) Value {
 		}
 	}
 	if i == len {
-		x := mkErr(o.v.idx, o.obj, 0, "field not found: %v", key)
+		x := mkErr(o.obj, 0, "field not found: %v", key)
 		x.NotExists = true
 		// TODO: more specifically we should test whether the values that
 		// are addressable from the root of the configuration can support the
@@ -180,7 +180,7 @@ func toMarshalErr(v Value, b *adt.Bottom) error {
 
 func marshalErrf(v Value, src adt.Node, code adt.ErrorCode, msg string, args ...interface{}) error {
 	arguments := append([]interface{}{code, msg}, args...)
-	b := mkErr(v.idx, src, arguments...)
+	b := mkErr(src, arguments...)
 	return toMarshalErr(v, b)
 }
 
@@ -962,8 +962,7 @@ func (v Value) Syntax(opts ...Option) ast.Node {
 	if v.v == nil {
 		return nil
 	}
-	var o options = getOptions(opts)
-	// var inst *Instance
+	o := getOptions(opts)
 
 	p := export.Profile{
 		Simplify:        !o.raw,
@@ -1251,11 +1250,11 @@ func (v Value) checkKind(ctx *adt.OpContext, want adt.Kind) *adt.Bottom {
 	k := x.Kind()
 	if want != adt.BottomKind {
 		if k&want == adt.BottomKind {
-			return mkErr(v.idx, x, "cannot use value %v (type %s) as %s",
+			return mkErr(x, "cannot use value %v (type %s) as %s",
 				ctx.Str(x), k, want)
 		}
 		if !adt.IsConcrete(x) {
-			return mkErr(v.idx, x, adt.IncompleteError, "non-concrete value %v", k)
+			return mkErr(x, adt.IncompleteError, "non-concrete value %v", k)
 		}
 	}
 	return nil
@@ -1298,7 +1297,7 @@ func (v Value) Len() Value {
 		}
 	}
 	const msg = "len not supported for type %v"
-	return remakeValue(v, nil, mkErr(v.idx, v.v, msg, v.Kind()))
+	return remakeValue(v, nil, mkErr(v.v, msg, v.Kind()))
 
 }
 
@@ -1735,7 +1734,7 @@ func (v Value) FillPath(p Path, x interface{}) Value {
 	}
 	ctx := v.ctx()
 	if err := p.Err(); err != nil {
-		return newErrValue(v, mkErr(v.idx, nil, 0, "invalid path: %v", err))
+		return newErrValue(v, mkErr(nil, 0, "invalid path: %v", err))
 	}
 	var expr adt.Expr
 	switch x := x.(type) {

internal/astinternal/debug.go

@@ -17,7 +17,6 @@ package astinternal
 import (
 	"fmt"
 	gotoken "go/token"
-	"io"
 	"reflect"
 	"strconv"
 	"strings"
@@ -52,7 +51,6 @@ type DebugConfig struct {
 }
 
 type debugPrinter struct {
-	w     io.Writer
 	buf   []byte
 	cfg   DebugConfig
 	level int

internal/core/adt/unify.go

@@ -426,8 +426,6 @@ func (n *nodeContext) completeNodeTasks(mode runMode) {
 
 		cc.decDependent(n.ctx, ROOT, nil) // REF(decrement:nodeDone)
 	}
-
-	return
 }
 
 func (n *nodeContext) updateScalar() {

internal/encoding/encoder.go

@@ -69,10 +69,7 @@ func (e Encoder) Close() error {
 
 // NewEncoder writes content to the file with the given specification.
 func NewEncoder(ctx *cue.Context, f *build.File, cfg *Config) (*Encoder, error) {
-	w, close, err := writer(f, cfg)
-	if err != nil {
-		return nil, err
-	}
+	w, close := writer(f, cfg)
 	e := &Encoder{
 		ctx:   ctx,
 		cfg:   cfg,
@@ -290,16 +287,16 @@ func (e *Encoder) encodeFile(f *ast.File, interpret func(cue.Value) (*ast.File,
 	return e.encValue(v)
 }
 
-func writer(f *build.File, cfg *Config) (_ io.Writer, close func() error, err error) {
+func writer(f *build.File, cfg *Config) (_ io.Writer, close func() error) {
 	if cfg.Out != nil {
-		return cfg.Out, nil, nil
+		return cfg.Out, nil
 	}
 	path := f.Filename
 	if path == "-" {
 		if cfg.Stdout == nil {
-			return os.Stdout, nil, nil
+			return os.Stdout, nil
 		}
-		return cfg.Stdout, nil, nil
+		return cfg.Stdout, nil
 	}
 	// Delay opening the file until we can write it to completion.
 	// This prevents clobbering the file in case of a crash.
@@ -323,5 +320,5 @@ func writer(f *build.File, cfg *Config) (_ io.Writer, close func() error, err er
 		}
 		return err
 	}
-	return b, fn, nil
+	return b, fn
 }