remove logs from opts

Author: alixander

xmain/opts.go

@@ -9,20 +9,18 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"oss.terrastruct.com/util-go/cmdlog"
 	"oss.terrastruct.com/util-go/xos"
 )
 
 type Opts struct {
 	Args  []string
 	Flags *pflag.FlagSet
 	env   *xos.Env
-	log   *cmdlog.Logger
 
 	flagEnv map[string]string
 }
 
-func NewOpts(env *xos.Env, log *cmdlog.Logger, args []string) *Opts {
+func NewOpts(env *xos.Env, args []string) *Opts {
 	flags := pflag.NewFlagSet("", pflag.ContinueOnError)
 	flags.SortFlags = false
 	flags.Usage = func() {}
@@ -31,7 +29,6 @@ func NewOpts(env *xos.Env, log *cmdlog.Logger, args []string) *Opts {
 		Args:    args,
 		Flags:   flags,
 		env:     env,
-		log:     log,
 		flagEnv: make(map[string]string),
 	}
 }

xmain/xmain.go

@@ -38,7 +38,7 @@ func Main(run RunFunc) {
 		Env: xos.NewEnv(os.Environ()),
 	}
 	ms.Log = cmdlog.New(ms.Env, ms.Stderr)
-	ms.Opts = NewOpts(ms.Env, ms.Log, args)
+	ms.Opts = NewOpts(ms.Env, args)
 
 	wd, err := os.Getwd()
 	if err != nil {

xmain/xmaintest.go

@@ -77,7 +77,7 @@ func (ts *TestState) Start(tb testing.TB, ctx context.Context) {
 
 		Log:  log,
 		Env:  ts.Env,
-		Opts: NewOpts(ts.Env, log, args),
+		Opts: NewOpts(ts.Env, args),
 		PWD:  ts.PWD,
 	}