From 79b0d82993d406ac1dcf454897f099b819216074 Mon Sep 17 00:00:00 2001 From: Martin Lindhe Date: Sat, 27 Oct 2018 13:16:08 +0200 Subject: [PATCH] update vendor --- Gopkg.lock | 25 ++++++++++++++--- Gopkg.toml | 28 ++++--------------- Makefile | 1 - vendor/github.com/BurntSushi/toml/COPYING | 27 +++++++++++------- .../github.com/BurntSushi/toml/decode_test.go | 14 ++++++++++ vendor/github.com/BurntSushi/toml/lex.go | 2 +- 6 files changed, 58 insertions(+), 39 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index ed2d165..2a3752d 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,38 +2,55 @@ [[projects]] + branch = "master" + digest = "1:5d72bbcc9c8667b11c3dc3cbe681c5a6f71e5096744c0bf7726ab5c6425d5dc4" name = "github.com/BurntSushi/toml" packages = ["."] - revision = "b26d9c308763d68093482582cea63d69be07a0f0" - version = "v0.3.0" + pruneopts = "NUT" + revision = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005" [[projects]] branch = "master" + digest = "1:f3793f8a708522400cef1dba23385e901aede5519f68971fd69938ef330b07a1" name = "github.com/alecthomas/template" - packages = [".","parse"] + packages = [ + ".", + "parse", + ] + pruneopts = "NUT" revision = "a0175ee3bccc567396460bf5acd36800cb10c49c" [[projects]] branch = "master" + digest = "1:fdd419e104ec26bb5bd63cc62637c640453ed2929a7453f3afadbd9a0223da66" name = "github.com/alecthomas/units" packages = ["."] + pruneopts = "NUT" revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a" [[projects]] branch = "master" + digest = "1:9c94adb84080287919cda31447549e0ce8f8cc2067e19ce51537cf4572868d36" name = "github.com/andrew-d/go-termutil" packages = ["."] + pruneopts = "NUT" revision = "009166a695a2f516c749a26b4ac1f183d89aa336" [[projects]] + digest = "1:22b2dee6f30bc8601f087449a2a819df8388e54e9547349c658f14d8f8c590f2" name = "gopkg.in/alecthomas/kingpin.v2" packages = ["."] + pruneopts = "NUT" revision = "947dcec5ba9c011838740e680966fd7087a71d0d" version = "v2.2.6" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "8af26cfb0fca3790f9adb4313ad7adb9b2b9a7c7860c9fca42bed46008dc06d8" + input-imports = [ + "github.com/BurntSushi/toml", + "github.com/andrew-d/go-termutil", + "gopkg.in/alecthomas/kingpin.v2", + ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 3fae3e3..8e44095 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,29 +1,11 @@ - -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" - +[prune] + go-tests = true + non-go = true + unused-packages = true [[constraint]] + branch = "master" name = "github.com/BurntSushi/toml" - version = "0.3.0" [[constraint]] branch = "master" diff --git a/Makefile b/Makefile index b037b85..33953b2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ update-vendor: dep ensure dep ensure -update - dep prune release: goreleaser --rm-dist diff --git a/vendor/github.com/BurntSushi/toml/COPYING b/vendor/github.com/BurntSushi/toml/COPYING index 5a8e332..01b5743 100644 --- a/vendor/github.com/BurntSushi/toml/COPYING +++ b/vendor/github.com/BurntSushi/toml/COPYING @@ -1,14 +1,21 @@ - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 +The MIT License (MIT) - Copyright (C) 2004 Sam Hocevar +Copyright (c) 2013 TOML authors - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/vendor/github.com/BurntSushi/toml/decode_test.go b/vendor/github.com/BurntSushi/toml/decode_test.go index 0c36b33..95bc987 100644 --- a/vendor/github.com/BurntSushi/toml/decode_test.go +++ b/vendor/github.com/BurntSushi/toml/decode_test.go @@ -16,6 +16,8 @@ age = 250 andrew = "gallant" kait = "brady" now = 1987-07-05T05:45:00Z +nowEast = 2017-06-22T16:15:21+08:00 +nowWest = 2017-06-22T02:14:36-06:00 yesOrNo = true pi = 3.14 colors = [ @@ -38,6 +40,8 @@ cauchy = "cat 2" Pi float64 YesOrNo bool Now time.Time + NowEast time.Time + NowWest time.Time Andrew string Kait string My map[string]cats @@ -53,11 +57,21 @@ cauchy = "cat 2" if err != nil { panic(err) } + nowEast, err := time.Parse("2006-01-02T15:04:05-07:00", "2017-06-22T16:15:21+08:00") + if err != nil { + panic(err) + } + nowWest, err := time.Parse("2006-01-02T15:04:05-07:00", "2017-06-22T02:14:36-06:00") + if err != nil { + panic(err) + } var answer = simple{ Age: 250, Andrew: "gallant", Kait: "brady", Now: now, + NowEast: nowEast, + NowWest: nowWest, YesOrNo: true, Pi: 3.14, Colors: [][]string{ diff --git a/vendor/github.com/BurntSushi/toml/lex.go b/vendor/github.com/BurntSushi/toml/lex.go index 6dee7fc..e0a742a 100644 --- a/vendor/github.com/BurntSushi/toml/lex.go +++ b/vendor/github.com/BurntSushi/toml/lex.go @@ -775,7 +775,7 @@ func lexDatetime(lx *lexer) stateFn { return lexDatetime } switch r { - case '-', 'T', ':', '.', 'Z': + case '-', 'T', ':', '.', 'Z', '+': return lexDatetime }