Update dependencies (#1929)

2 files changed, 12 insertions, 72 deletions

diff --git a/vendor/modernc.org/opt/Makefile b/vendor/modernc.org/opt/Makefile
index f1dbabc7..8fc8fb40 100644
--- a/vendor/modernc.org/opt/Makefile
+++ b/vendor/modernc.org/opt/Makefile
@@ -1,81 +1,18 @@
-# Copyright 2019 The Opt Authors. All rights reserved.
+# Copyright 2022 The Opt Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-.PHONY:	all bench clean cover cpu editor internalError later mem nuke todo edit devbench
-
-grep=--include=*.go --include=*.l --include=*.y --include=*.yy
-ngrep='internalError\|TODOOK\|lexer\.go\|parser\.go\|ast.go\|trigraphs\.go\|.*_string\.go\|stringer\.go\|testdata\/gcc'
-
-all:
-	date
-	go version 2>&1 | tee log
-	./unconvert.sh
-	gofmt -l -s -w *.go
-	go test -i
-	go test 2>&1 | tee -a log
-	go install -v ./...
-	GOOS=linux GOARCH=arm go build
-	GOOS=linux GOARCH=386 go build
-	GOOS=linux GOARCH=amd64 go build
-	GOOS=windows GOARCH=386 go build
-	GOOS=windows GOARCH=amd64 go build
-	go vet 2>&1 | grep -v $(ngrep) || true
-	golint 2>&1 | grep -v $(ngrep) || true
-	make todo
-	misspell *.go
-	staticcheck | grep -v 'lexer\.go\|parser\.go' || true
-	maligned || true
-	grep -n 'FAIL\|PASS' log 
-	go version
-	date 2>&1 | tee -a log
-
-devbench:
-	date 2>&1 | tee log-devbench
-	go test -timeout 24h -dev -run @ -bench . 2>&1 | tee -a log-devbench
-	grep -n 'FAIL\|SKIP' log-devbench || true
-
-bench:
-	date 2>&1 | tee log-bench
-	go test -timeout 24h -v -run '^[^E]' -bench . 2>&1 | tee -a log-bench
-	grep -n 'FAIL\|SKIP' log-bench || true
+.PHONY:	clean edit editor
 
 clean:
+	rm -f log-* cpu.test mem.test *.out
 	go clean
-	rm -f *~ *.test *.out
-
-cover:
-	t=$(shell mktemp) ; go test -coverprofile $$t && go tool cover -html $$t && unlink $$t
-
-cpu: clean
-	go test -run @ -bench . -cpuprofile cpu.out
-	go tool pprof -lines *.test cpu.out
 
 edit:
-	touch log
-	gvim -p Makefile *.go &
+	@touch log
+	@if [ -f "Session.vim" ]; then gvim -S & else gvim -p Makefile *.go & fi
 
 editor:
 	gofmt -l -s -w *.go
-	go test -i
-	go test -short 2>&1 | tee log
-	go install
-
-later:
-	@grep -n $(grep) LATER * || true
-	@grep -n $(grep) MAYBE * || true
-
-mem: clean
-	go test -v -run ParserCS -memprofile mem.out -timeout 24h
-	go tool pprof -lines -web -alloc_space *.test mem.out
-
-nuke: clean
-	go clean -i
-
-todo:
-	@grep -nr $(grep) ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alpha:]][[:alnum:]]* * | grep -v $(ngrep) || true
-	@grep -nr $(grep) 'TODO\|panic' * | grep -v $(ngrep) || true
-	@grep -nr $(grep) BUG * | grep -v $(ngrep) || true
-	@grep -nr $(grep) [^[:alpha:]]println * | grep -v $(ngrep) || true
-	@grep -nir $(grep) 'work.*progress' || true
-
+	go test -o /dev/null -c
+	go install 2>&1 | tee log-editor
diff --git a/vendor/modernc.org/opt/opt.go b/vendor/modernc.org/opt/opt.go
index 0085e9f2..b4bd8282 100644
--- a/vendor/modernc.org/opt/opt.go
+++ b/vendor/modernc.org/opt/opt.go
@@ -70,6 +70,7 @@ func (p *Set) Parse(opts []string, handler func(string) error) (err error) {
 
 	for len(opts) != 0 {
 		opt := opts[0]
+		opt0 := opt
 		opts = opts[1:]
 		var arg string
 	out:
@@ -90,7 +91,9 @@ func (p *Set) Parse(opts []string, handler func(string) error) (err error) {
 
 						opts = opts[1:]
 					default:
-						if err = cfg.handler(opt[:len(cfg.name)+1], name[len(cfg.name):]); err != nil {
+						opt = opt[:len(cfg.name)+1]
+						val := strings.TrimPrefix(name[len(cfg.name):], "=")
+						if err = cfg.handler(opt, val); err != nil {
 							return err
 						}
 					}
@@ -105,7 +108,7 @@ func (p *Set) Parse(opts []string, handler func(string) error) (err error) {
 			}
 			switch cfg := p.cfg[name]; {
 			case cfg == nil:
-				if err = handler(opt); err != nil {
+				if err = handler(opt0); err != nil {
 					return err
 				}
 			default: