From c469632ee0b17ffa856219d10ce9d7c7001cb7d0 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 2 Nov 2017 10:41:46 -0200 Subject: [PATCH] update deps --- Gopkg.lock | 10 +-- vendor/github.com/spf13/pflag/flag.go | 7 +- vendor/github.com/spf13/pflag/int16.go | 88 ++++++++++++++++++++++ vendor/golang.org/x/net/context/context.go | 2 + vendor/mvdan.cc/sh/README.md | 31 ++++---- vendor/mvdan.cc/sh/syntax/lexer.go | 5 +- 6 files changed, 119 insertions(+), 24 deletions(-) create mode 100644 vendor/github.com/spf13/pflag/int16.go diff --git a/Gopkg.lock b/Gopkg.lock index c9235514..e20fd623 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -71,7 +71,7 @@ branch = "master" name = "github.com/spf13/pflag" packages = ["."] - revision = "a9789e855c7696159b7db0db7f440b449edf2b31" + revision = "97afa5e7ca8a08a383cb259e06636b5e2cc7897f" [[projects]] name = "github.com/stretchr/testify" @@ -83,19 +83,19 @@ branch = "master" name = "golang.org/x/crypto" packages = ["pbkdf2","scrypt"] - revision = "9419663f5a44be8b34ca85f08abc5fe1be11f8a3" + revision = "bd6f299fb381e4c3393d1c4b1f0b94f5e77650c8" [[projects]] branch = "master" name = "golang.org/x/net" packages = ["context"] - revision = "a04bdaca5b32abe1c069418fb7088ae607de5bd0" + revision = "ea0da6f35caf3ff91581c800469e22eef75076f4" [[projects]] branch = "master" name = "golang.org/x/sync" packages = ["errgroup"] - revision = "8e0aa688b654ef28caa72506fa5ec8dba9fc7690" + revision = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5" [[projects]] branch = "v2" @@ -107,7 +107,7 @@ branch = "master" name = "mvdan.cc/sh" packages = ["interp","syntax"] - revision = "24a28656b7c1d2532406e69527366ecf9f455a17" + revision = "6582b4e9a06a902580267d416b57fe49947ea29f" [solve-meta] analyzer-name = "dep" diff --git a/vendor/github.com/spf13/pflag/flag.go b/vendor/github.com/spf13/pflag/flag.go index 187e4c9a..73c237b0 100644 --- a/vendor/github.com/spf13/pflag/flag.go +++ b/vendor/github.com/spf13/pflag/flag.go @@ -873,8 +873,10 @@ func VarP(value Value, name, shorthand, usage string) { // returns the error. func (f *FlagSet) failf(format string, a ...interface{}) error { err := fmt.Errorf(format, a...) - fmt.Fprintln(f.out(), err) - f.usage() + if f.errorHandling != ContinueOnError { + fmt.Fprintln(f.out(), err) + f.usage() + } return err } @@ -1056,6 +1058,7 @@ func (f *FlagSet) Parse(arguments []string) error { case ContinueOnError: return err case ExitOnError: + fmt.Println(err) os.Exit(2) case PanicOnError: panic(err) diff --git a/vendor/github.com/spf13/pflag/int16.go b/vendor/github.com/spf13/pflag/int16.go new file mode 100644 index 00000000..f1a01d05 --- /dev/null +++ b/vendor/github.com/spf13/pflag/int16.go @@ -0,0 +1,88 @@ +package pflag + +import "strconv" + +// -- int16 Value +type int16Value int16 + +func newInt16Value(val int16, p *int16) *int16Value { + *p = val + return (*int16Value)(p) +} + +func (i *int16Value) Set(s string) error { + v, err := strconv.ParseInt(s, 0, 16) + *i = int16Value(v) + return err +} + +func (i *int16Value) Type() string { + return "int16" +} + +func (i *int16Value) String() string { return strconv.FormatInt(int64(*i), 10) } + +func int16Conv(sval string) (interface{}, error) { + v, err := strconv.ParseInt(sval, 0, 16) + if err != nil { + return 0, err + } + return int16(v), nil +} + +// GetInt16 returns the int16 value of a flag with the given name +func (f *FlagSet) GetInt16(name string) (int16, error) { + val, err := f.getFlagType(name, "int16", int16Conv) + if err != nil { + return 0, err + } + return val.(int16), nil +} + +// Int16Var defines an int16 flag with specified name, default value, and usage string. +// The argument p points to an int16 variable in which to store the value of the flag. +func (f *FlagSet) Int16Var(p *int16, name string, value int16, usage string) { + f.VarP(newInt16Value(value, p), name, "", usage) +} + +// Int16VarP is like Int16Var, but accepts a shorthand letter that can be used after a single dash. +func (f *FlagSet) Int16VarP(p *int16, name, shorthand string, value int16, usage string) { + f.VarP(newInt16Value(value, p), name, shorthand, usage) +} + +// Int16Var defines an int16 flag with specified name, default value, and usage string. +// The argument p points to an int16 variable in which to store the value of the flag. +func Int16Var(p *int16, name string, value int16, usage string) { + CommandLine.VarP(newInt16Value(value, p), name, "", usage) +} + +// Int16VarP is like Int16Var, but accepts a shorthand letter that can be used after a single dash. +func Int16VarP(p *int16, name, shorthand string, value int16, usage string) { + CommandLine.VarP(newInt16Value(value, p), name, shorthand, usage) +} + +// Int16 defines an int16 flag with specified name, default value, and usage string. +// The return value is the address of an int16 variable that stores the value of the flag. +func (f *FlagSet) Int16(name string, value int16, usage string) *int16 { + p := new(int16) + f.Int16VarP(p, name, "", value, usage) + return p +} + +// Int16P is like Int16, but accepts a shorthand letter that can be used after a single dash. +func (f *FlagSet) Int16P(name, shorthand string, value int16, usage string) *int16 { + p := new(int16) + f.Int16VarP(p, name, shorthand, value, usage) + return p +} + +// Int16 defines an int16 flag with specified name, default value, and usage string. +// The return value is the address of an int16 variable that stores the value of the flag. +func Int16(name string, value int16, usage string) *int16 { + return CommandLine.Int16P(name, "", value, usage) +} + +// Int16P is like Int16, but accepts a shorthand letter that can be used after a single dash. +func Int16P(name, shorthand string, value int16, usage string) *int16 { + return CommandLine.Int16P(name, shorthand, value, usage) +} diff --git a/vendor/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go index d3681ab4..a3c021d3 100644 --- a/vendor/golang.org/x/net/context/context.go +++ b/vendor/golang.org/x/net/context/context.go @@ -5,6 +5,8 @@ // Package context defines the Context type, which carries deadlines, // cancelation signals, and other request-scoped values across API boundaries // and between processes. +// As of Go 1.7 this package is available in the standard library under the +// name context. https://golang.org/pkg/context. // // Incoming requests to a server should create a Context, and outgoing calls to // servers should accept a Context. The chain of function calls between must diff --git a/vendor/mvdan.cc/sh/README.md b/vendor/mvdan.cc/sh/README.md index 4d940d7d..8d3bd3fa 100644 --- a/vendor/mvdan.cc/sh/README.md +++ b/vendor/mvdan.cc/sh/README.md @@ -25,7 +25,7 @@ operate on files with no extension and a shell shebang. Use `-i N` to indent with a number of spaces instead of tabs. There are other formatting options - see `shfmt -h`. -Packages are available for [Arch], [Homebrew], [NixOS] and [Void]. +Packages are available for [Arch], [CRUX], [Homebrew], [NixOS] and [Void]. #### Advantages over `bash -n` @@ -86,22 +86,25 @@ the parser and the printer. To get started, run: ### Related projects -* [format-shell] - Atom plugin for `shfmt` -* [shell-format] - VS Code plugin for `shfmt` * [dockerised-shfmt] - A docker image of `shfmt` +* [format-shell] - Atom plugin for `shfmt` +* [micro] - Editor with a built-in plugin for `shfmt` +* [shell-format] - VS Code plugin for `shfmt` * [vim-shfmt] - Vim plugin for `shfmt` -[posix shell]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html -[bash]: https://www.gnu.org/software/bash/ -[mksh]: https://www.mirbsd.org/mksh.htm -[examples]: https://godoc.org/mvdan.cc/sh/syntax#pkg-examples [arch]: https://aur.archlinux.org/packages/shfmt/ -[homebrew]: https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/shfmt.rb -[nixos]: https://github.com/NixOS/nixpkgs/blob/HEAD/pkgs/tools/text/shfmt/default.nix -[void]: https://github.com/voidlinux/void-packages/blob/HEAD/srcpkgs/shfmt/template -[go-fuzz]: https://github.com/dvyukov/go-fuzz -[posix-ambiguity]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_03 -[format-shell]: https://atom.io/packages/format-shell -[shell-format]: https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format +[bash]: https://www.gnu.org/software/bash/ +[crux]: https://github.com/6c37/crux-ports-git/tree/3.3/shfmt [dockerised-shfmt]: https://hub.docker.com/r/jamesmstone/shfmt/ +[examples]: https://godoc.org/mvdan.cc/sh/syntax#pkg-examples +[format-shell]: https://atom.io/packages/format-shell +[go-fuzz]: https://github.com/dvyukov/go-fuzz +[homebrew]: https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/shfmt.rb +[micro]: https://micro-editor.github.io/ +[mksh]: https://www.mirbsd.org/mksh.htm +[nixos]: https://github.com/NixOS/nixpkgs/blob/HEAD/pkgs/tools/text/shfmt/default.nix +[posix shell]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html +[posix-ambiguity]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_03 +[shell-format]: https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format [vim-shfmt]: https://github.com/z0mbix/vim-shfmt +[void]: https://github.com/voidlinux/void-packages/blob/HEAD/srcpkgs/shfmt/template diff --git a/vendor/mvdan.cc/sh/syntax/lexer.go b/vendor/mvdan.cc/sh/syntax/lexer.go index d0c955ba..f50429e0 100644 --- a/vendor/mvdan.cc/sh/syntax/lexer.go +++ b/vendor/mvdan.cc/sh/syntax/lexer.go @@ -71,9 +71,8 @@ retry: if p.litBs != nil { p.litBs = append(p.litBs, b) } - r := rune(b) - p.r, p.w = r, 1 - return r + p.w, p.r = 1, rune(b) + return p.r } if p.bsp+utf8.UTFMax >= len(p.bs) { // we might need up to 4 bytes to read a full