Depenancy upgrades and movign to dep. (#8630)

22 files changed, 0 insertions, 3573 deletions

diff --git a/vendor/golang.org/x/text/message/pipeline/extract.go b/vendor/golang.org/x/text/message/pipeline/extract.go
deleted file mode 100644
index 379cc6d86..000000000
--- a/vendor/golang.org/x/text/message/pipeline/extract.go
+++ /dev/null
@@ -1,314 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pipeline
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/constant"
-	"go/format"
-	"go/token"
-	"go/types"
-	"path"
-	"path/filepath"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-
-	fmtparser "golang.org/x/text/internal/format"
-	"golang.org/x/tools/go/loader"
-)
-
-// TODO:
-// - merge information into existing files
-// - handle different file formats (PO, XLIFF)
-// - handle features (gender, plural)
-// - message rewriting
-
-// - %m substitutions
-// - `msg:"etc"` tags
-// - msg/Msg top-level vars and strings.
-
-// Extract extracts all strings form the package defined in Config.
-func Extract(c *Config) (*State, error) {
-	conf := loader.Config{}
-	prog, err := loadPackages(&conf, c.Packages)
-	if err != nil {
-		return nil, wrap(err, "")
-	}
-
-	// print returns Go syntax for the specified node.
-	print := func(n ast.Node) string {
-		var buf bytes.Buffer
-		format.Node(&buf, conf.Fset, n)
-		return buf.String()
-	}
-
-	var messages []Message
-
-	for _, info := range prog.AllPackages {
-		for _, f := range info.Files {
-			// Associate comments with nodes.
-			cmap := ast.NewCommentMap(prog.Fset, f, f.Comments)
-			getComment := func(n ast.Node) string {
-				cs := cmap.Filter(n).Comments()
-				if len(cs) > 0 {
-					return strings.TrimSpace(cs[0].Text())
-				}
-				return ""
-			}
-
-			// Find function calls.
-			ast.Inspect(f, func(n ast.Node) bool {
-				call, ok := n.(*ast.CallExpr)
-				if !ok {
-					return true
-				}
-
-				// Skip calls of functions other than
-				// (*message.Printer).{Sp,Fp,P}rintf.
-				sel, ok := call.Fun.(*ast.SelectorExpr)
-				if !ok {
-					return true
-				}
-				meth := info.Selections[sel]
-				if meth == nil || meth.Kind() != types.MethodVal {
-					return true
-				}
-				// TODO: remove cheap hack and check if the type either
-				// implements some interface or is specifically of type
-				// "golang.org/x/text/message".Printer.
-				m, ok := extractFuncs[path.Base(meth.Recv().String())]
-				if !ok {
-					return true
-				}
-
-				fmtType, ok := m[meth.Obj().Name()]
-				if !ok {
-					return true
-				}
-				// argn is the index of the format string.
-				argn := fmtType.arg
-				if argn >= len(call.Args) {
-					return true
-				}
-
-				args := call.Args[fmtType.arg:]
-
-				fmtMsg, ok := msgStr(info, args[0])
-				if !ok {
-					// TODO: identify the type of the format argument. If it
-					// is not a string, multiple keys may be defined.
-					return true
-				}
-				comment := ""
-				key := []string{}
-				if ident, ok := args[0].(*ast.Ident); ok {
-					key = append(key, ident.Name)
-					if v, ok := ident.Obj.Decl.(*ast.ValueSpec); ok && v.Comment != nil {
-						// TODO: get comment above ValueSpec as well
-						comment = v.Comment.Text()
-					}
-				}
-
-				arguments := []argument{}
-				args = args[1:]
-				simArgs := make([]interface{}, len(args))
-				for i, arg := range args {
-					expr := print(arg)
-					val := ""
-					if v := info.Types[arg].Value; v != nil {
-						val = v.ExactString()
-						simArgs[i] = val
-						switch arg.(type) {
-						case *ast.BinaryExpr, *ast.UnaryExpr:
-							expr = val
-						}
-					}
-					arguments = append(arguments, argument{
-						ArgNum:         i + 1,
-						Type:           info.Types[arg].Type.String(),
-						UnderlyingType: info.Types[arg].Type.Underlying().String(),
-						Expr:           expr,
-						Value:          val,
-						Comment:        getComment(arg),
-						Position:       posString(conf, info, arg.Pos()),
-						// TODO report whether it implements
-						// interfaces plural.Interface,
-						// gender.Interface.
-					})
-				}
-				msg := ""
-
-				ph := placeholders{index: map[string]string{}}
-
-				trimmed, _, _ := trimWS(fmtMsg)
-
-				p := fmtparser.Parser{}
-				p.Reset(simArgs)
-				for p.SetFormat(trimmed); p.Scan(); {
-					switch p.Status {
-					case fmtparser.StatusText:
-						msg += p.Text()
-					case fmtparser.StatusSubstitution,
-						fmtparser.StatusBadWidthSubstitution,
-						fmtparser.StatusBadPrecSubstitution:
-						arguments[p.ArgNum-1].used = true
-						arg := arguments[p.ArgNum-1]
-						sub := p.Text()
-						if !p.HasIndex {
-							r, sz := utf8.DecodeLastRuneInString(sub)
-							sub = fmt.Sprintf("%s[%d]%c", sub[:len(sub)-sz], p.ArgNum, r)
-						}
-						msg += fmt.Sprintf("{%s}", ph.addArg(&arg, sub))
-					}
-				}
-				key = append(key, msg)
-
-				// Add additional Placeholders that can be used in translations
-				// that are not present in the string.
-				for _, arg := range arguments {
-					if arg.used {
-						continue
-					}
-					ph.addArg(&arg, fmt.Sprintf("%%[%d]v", arg.ArgNum))
-				}
-
-				if c := getComment(call.Args[0]); c != "" {
-					comment = c
-				}
-
-				messages = append(messages, Message{
-					ID:      key,
-					Key:     fmtMsg,
-					Message: Text{Msg: msg},
-					// TODO(fix): this doesn't get the before comment.
-					Comment:      comment,
-					Placeholders: ph.slice,
-					Position:     posString(conf, info, call.Lparen),
-				})
-				return true
-			})
-		}
-	}
-
-	return &State{
-		Config:  *c,
-		program: prog,
-		Extracted: Messages{
-			Language: c.SourceLanguage,
-			Messages: messages,
-		},
-	}, nil
-}
-
-func posString(conf loader.Config, info *loader.PackageInfo, pos token.Pos) string {
-	p := conf.Fset.Position(pos)
-	file := fmt.Sprintf("%s:%d:%d", filepath.Base(p.Filename), p.Line, p.Column)
-	return filepath.Join(info.Pkg.Path(), file)
-}
-
-// extractFuncs indicates the types and methods for which to extract strings,
-// and which argument to extract.
-// TODO: use the types in conf.Import("golang.org/x/text/message") to extract
-// the correct instances.
-var extractFuncs = map[string]map[string]extractType{
-	// TODO: Printer -> *golang.org/x/text/message.Printer
-	"message.Printer": {
-		"Printf":  extractType{arg: 0, format: true},
-		"Sprintf": extractType{arg: 0, format: true},
-		"Fprintf": extractType{arg: 1, format: true},
-
-		"Lookup": extractType{arg: 0},
-	},
-}
-
-type extractType struct {
-	// format indicates if the next arg is a formatted string or whether to
-	// concatenate all arguments
-	format bool
-	// arg indicates the position of the argument to extract.
-	arg int
-}
-
-func getID(arg *argument) string {
-	s := getLastComponent(arg.Expr)
-	s = strip(s)
-	s = strings.Replace(s, " ", "", -1)
-	// For small variable names, use user-defined types for more info.
-	if len(s) <= 2 && arg.UnderlyingType != arg.Type {
-		s = getLastComponent(arg.Type)
-	}
-	return strings.Title(s)
-}
-
-// strip is a dirty hack to convert function calls to placeholder IDs.
-func strip(s string) string {
-	s = strings.Map(func(r rune) rune {
-		if unicode.IsSpace(r) || r == '-' {
-			return '_'
-		}
-		if !unicode.In(r, unicode.Letter, unicode.Mark, unicode.Number) {
-			return -1
-		}
-		return r
-	}, s)
-	// Strip "Get" from getter functions.
-	if strings.HasPrefix(s, "Get") || strings.HasPrefix(s, "get") {
-		if len(s) > len("get") {
-			r, _ := utf8.DecodeRuneInString(s)
-			if !unicode.In(r, unicode.Ll, unicode.M) { // not lower or mark
-				s = s[len("get"):]
-			}
-		}
-	}
-	return s
-}
-
-type placeholders struct {
-	index map[string]string
-	slice []Placeholder
-}
-
-func (p *placeholders) addArg(arg *argument, sub string) (id string) {
-	id = getID(arg)
-	id1 := id
-	alt, ok := p.index[id1]
-	for i := 1; ok && alt != sub; i++ {
-		id1 = fmt.Sprintf("%s_%d", id, i)
-		alt, ok = p.index[id1]
-	}
-	p.index[id1] = sub
-	p.slice = append(p.slice, Placeholder{
-		ID:             id1,
-		String:         sub,
-		Type:           arg.Type,
-		UnderlyingType: arg.UnderlyingType,
-		ArgNum:         arg.ArgNum,
-		Expr:           arg.Expr,
-		Comment:        arg.Comment,
-	})
-	return id1
-}
-
-func getLastComponent(s string) string {
-	return s[1+strings.LastIndexByte(s, '.'):]
-}
-
-func msgStr(info *loader.PackageInfo, e ast.Expr) (s string, ok bool) {
-	v := info.Types[e].Value
-	if v == nil || v.Kind() != constant.String {
-		return "", false
-	}
-	s = constant.StringVal(v)
-	// Only record strings with letters.
-	for _, r := range s {
-		if unicode.In(r, unicode.L) {
-			return s, true
-		}
-	}
-	return "", false
-}
diff --git a/vendor/golang.org/x/text/message/pipeline/generate.go b/vendor/golang.org/x/text/message/pipeline/generate.go
deleted file mode 100644
index 5d329b2f4..000000000
--- a/vendor/golang.org/x/text/message/pipeline/generate.go
+++ /dev/null
@@ -1,314 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pipeline
-
-import (
-	"fmt"
-	"go/build"
-	"io"
-	"path/filepath"
-	"regexp"
-	"sort"
-	"strings"
-	"text/template"
-
-	"golang.org/x/text/collate"
-	"golang.org/x/text/feature/plural"
-	"golang.org/x/text/internal"
-	"golang.org/x/text/internal/catmsg"
-	"golang.org/x/text/internal/gen"
-	"golang.org/x/text/language"
-	"golang.org/x/tools/go/loader"
-)
-
-var transRe = regexp.MustCompile(`messages\.(.*)\.json`)
-
-// Generate writes a Go file that defines a Catalog with translated messages.
-// Translations are retrieved from s.Messages, not s.Translations, so it
-// is assumed Merge has been called.
-func (s *State) Generate() error {
-	path := s.Config.GenPackage
-	if path == "" {
-		path = "."
-	}
-	isDir := path[0] == '.'
-	prog, err := loadPackages(&loader.Config{}, []string{path})
-	if err != nil {
-		return wrap(err, "could not load package")
-	}
-	pkgs := prog.InitialPackages()
-	if len(pkgs) != 1 {
-		return errorf("more than one package selected: %v", pkgs)
-	}
-	pkg := pkgs[0].Pkg.Name()
-
-	cw, err := s.generate()
-	if err != nil {
-		return err
-	}
-	if !isDir {
-		gopath := build.Default.GOPATH
-		path = filepath.Join(gopath, filepath.FromSlash(pkgs[0].Pkg.Path()))
-	}
-	path = filepath.Join(path, s.Config.GenFile)
-	cw.WriteGoFile(path, pkg) // TODO: WriteGoFile should return error.
-	return err
-}
-
-// WriteGen writes a Go file with the given package name to w that defines a
-// Catalog with translated messages. Translations are retrieved from s.Messages,
-// not s.Translations, so it is assumed Merge has been called.
-func (s *State) WriteGen(w io.Writer, pkg string) error {
-	cw, err := s.generate()
-	if err != nil {
-		return err
-	}
-	_, err = cw.WriteGo(w, pkg, "")
-	return err
-}
-
-// Generate is deprecated; use (*State).Generate().
-func Generate(w io.Writer, pkg string, extracted *Messages, trans ...Messages) (n int, err error) {
-	s := State{
-		Extracted:    *extracted,
-		Translations: trans,
-	}
-	cw, err := s.generate()
-	if err != nil {
-		return 0, err
-	}
-	return cw.WriteGo(w, pkg, "")
-}
-
-func (s *State) generate() (*gen.CodeWriter, error) {
-	// Build up index of translations and original messages.
-	translations := map[language.Tag]map[string]Message{}
-	languages := []language.Tag{}
-	usedKeys := map[string]int{}
-
-	for _, loc := range s.Messages {
-		tag := loc.Language
-		if _, ok := translations[tag]; !ok {
-			translations[tag] = map[string]Message{}
-			languages = append(languages, tag)
-		}
-		for _, m := range loc.Messages {
-			if !m.Translation.IsEmpty() {
-				for _, id := range m.ID {
-					if _, ok := translations[tag][id]; ok {
-						warnf("Duplicate translation in locale %q for message %q", tag, id)
-					}
-					translations[tag][id] = m
-				}
-			}
-		}
-	}
-
-	// Verify completeness and register keys.
-	internal.SortTags(languages)
-
-	langVars := []string{}
-	for _, tag := range languages {
-		langVars = append(langVars, strings.Replace(tag.String(), "-", "_", -1))
-		dict := translations[tag]
-		for _, msg := range s.Extracted.Messages {
-			for _, id := range msg.ID {
-				if trans, ok := dict[id]; ok && !trans.Translation.IsEmpty() {
-					if _, ok := usedKeys[msg.Key]; !ok {
-						usedKeys[msg.Key] = len(usedKeys)
-					}
-					break
-				}
-				// TODO: log missing entry.
-				warnf("%s: Missing entry for %q.", tag, id)
-			}
-		}
-	}
-
-	cw := gen.NewCodeWriter()
-
-	x := &struct {
-		Fallback  language.Tag
-		Languages []string
-	}{
-		Fallback:  s.Extracted.Language,
-		Languages: langVars,
-	}
-
-	if err := lookup.Execute(cw, x); err != nil {
-		return nil, wrap(err, "error")
-	}
-
-	keyToIndex := []string{}
-	for k := range usedKeys {
-		keyToIndex = append(keyToIndex, k)
-	}
-	sort.Strings(keyToIndex)
-	fmt.Fprint(cw, "var messageKeyToIndex = map[string]int{\n")
-	for _, k := range keyToIndex {
-		fmt.Fprintf(cw, "%q: %d,\n", k, usedKeys[k])
-	}
-	fmt.Fprint(cw, "}\n\n")
-
-	for i, tag := range languages {
-		dict := translations[tag]
-		a := make([]string, len(usedKeys))
-		for _, msg := range s.Extracted.Messages {
-			for _, id := range msg.ID {
-				if trans, ok := dict[id]; ok && !trans.Translation.IsEmpty() {
-					m, err := assemble(&msg, &trans.Translation)
-					if err != nil {
-						return nil, wrap(err, "error")
-					}
-					_, leadWS, trailWS := trimWS(msg.Key)
-					if leadWS != "" || trailWS != "" {
-						m = catmsg.Affix{
-							Message: m,
-							Prefix:  leadWS,
-							Suffix:  trailWS,
-						}
-					}
-					// TODO: support macros.
-					data, err := catmsg.Compile(tag, nil, m)
-					if err != nil {
-						return nil, wrap(err, "error")
-					}
-					key := usedKeys[msg.Key]
-					if d := a[key]; d != "" && d != data {
-						warnf("Duplicate non-consistent translation for key %q, picking the one for message %q", msg.Key, id)
-					}
-					a[key] = string(data)
-					break
-				}
-			}
-		}
-		index := []uint32{0}
-		p := 0
-		for _, s := range a {
-			p += len(s)
-			index = append(index, uint32(p))
-		}
-
-		cw.WriteVar(langVars[i]+"Index", index)
-		cw.WriteConst(langVars[i]+"Data", strings.Join(a, ""))
-	}
-	return cw, nil
-}
-
-func assemble(m *Message, t *Text) (msg catmsg.Message, err error) {
-	keys := []string{}
-	for k := range t.Var {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	var a []catmsg.Message
-	for _, k := range keys {
-		t := t.Var[k]
-		m, err := assemble(m, &t)
-		if err != nil {
-			return nil, err
-		}
-		a = append(a, &catmsg.Var{Name: k, Message: m})
-	}
-	if t.Select != nil {
-		s, err := assembleSelect(m, t.Select)
-		if err != nil {
-			return nil, err
-		}
-		a = append(a, s)
-	}
-	if t.Msg != "" {
-		sub, err := m.Substitute(t.Msg)
-		if err != nil {
-			return nil, err
-		}
-		a = append(a, catmsg.String(sub))
-	}
-	switch len(a) {
-	case 0:
-		return nil, errorf("generate: empty message")
-	case 1:
-		return a[0], nil
-	default:
-		return catmsg.FirstOf(a), nil
-
-	}
-}
-
-func assembleSelect(m *Message, s *Select) (msg catmsg.Message, err error) {
-	cases := []string{}
-	for c := range s.Cases {
-		cases = append(cases, c)
-	}
-	sortCases(cases)
-
-	caseMsg := []interface{}{}
-	for _, c := range cases {
-		cm := s.Cases[c]
-		m, err := assemble(m, &cm)
-		if err != nil {
-			return nil, err
-		}
-		caseMsg = append(caseMsg, c, m)
-	}
-
-	ph := m.Placeholder(s.Arg)
-
-	switch s.Feature {
-	case "plural":
-		// TODO: only printf-style selects are supported as of yet.
-		return plural.Selectf(ph.ArgNum, ph.String, caseMsg...), nil
-	}
-	return nil, errorf("unknown feature type %q", s.Feature)
-}
-
-func sortCases(cases []string) {
-	// TODO: implement full interface.
-	sort.Slice(cases, func(i, j int) bool {
-		if cases[j] == "other" && cases[i] != "other" {
-			return true
-		}
-		// the following code relies on '<' < '=' < any letter.
-		return cmpNumeric(cases[i], cases[j]) == -1
-	})
-}
-
-var cmpNumeric = collate.New(language.Und, collate.Numeric).CompareString
-
-var lookup = template.Must(template.New("gen").Parse(`
-import (
-	"golang.org/x/text/language"
-	"golang.org/x/text/message"
-	"golang.org/x/text/message/catalog"
-)
-
-type dictionary struct {
-	index []uint32
-	data  string
-}
-
-func (d *dictionary) Lookup(key string) (data string, ok bool) {
-	p := messageKeyToIndex[key]
-	start, end := d.index[p], d.index[p+1]
-	if start == end {
-		return "", false
-	}
-	return d.data[start:end], true
-}
-
-func init() {
-	dict := map[string]catalog.Dictionary{
-		{{range .Languages}}"{{.}}": &dictionary{index: {{.}}Index, data: {{.}}Data },
-		{{end}}
-	}
-	fallback := language.MustParse("{{.Fallback}}")
-	cat, err := catalog.NewFromMap(dict, catalog.Fallback(fallback))
-	if err != nil {
-		panic(err)
-	}
-	message.DefaultCatalog = cat
-}
-
-`))
diff --git a/vendor/golang.org/x/text/message/pipeline/go19_test.go b/vendor/golang.org/x/text/message/pipeline/go19_test.go
deleted file mode 100644
index c9517c130..000000000
--- a/vendor/golang.org/x/text/message/pipeline/go19_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package pipeline
-
-import "testing"
-
-func init() {
-	setHelper = (*testing.T).Helper
-}
diff --git a/vendor/golang.org/x/text/message/pipeline/message.go b/vendor/golang.org/x/text/message/pipeline/message.go
deleted file mode 100644
index c83a8fd87..000000000
--- a/vendor/golang.org/x/text/message/pipeline/message.go
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pipeline
-
-import (
-	"encoding/json"
-	"errors"
-	"strings"
-
-	"golang.org/x/text/language"
-)
-
-// TODO: these definitions should be moved to a package so that the can be used
-// by other tools.
-
-// The file contains the structures used to define translations of a certain
-// messages.
-//
-// A translation may have multiple translations strings, or messages, depending
-// on the feature values of the various arguments. For instance, consider
-// a hypothetical translation from English to English, where the source defines
-// the format string "%d file(s) remaining".
-// See the examples directory for examples of extracted messages.
-
-// Messages is used to store translations for a single language.
-type Messages struct {
-	Language language.Tag    `json:"language"`
-	Messages []Message       `json:"messages"`
-	Macros   map[string]Text `json:"macros,omitempty"`
-}
-
-// A Message describes a message to be translated.
-type Message struct {
-	// ID contains a list of identifiers for the message.
-	ID IDList `json:"id"`
-	// Key is the string that is used to look up the message at runtime.
-	Key         string `json:"key,omitempty"`
-	Meaning     string `json:"meaning,omitempty"`
-	Message     Text   `json:"message"`
-	Translation Text   `json:"translation"`
-
-	Comment           string `json:"comment,omitempty"`
-	TranslatorComment string `json:"translatorComment,omitempty"`
-
-	Placeholders []Placeholder `json:"placeholders,omitempty"`
-
-	// Fuzzy indicates that the provide translation needs review by a
-	// translator, for instance because it was derived from automated
-	// translation.
-	Fuzzy bool `json:"fuzzy,omitempty"`
-
-	// TODO: default placeholder syntax is {foo}. Allow alternative escaping
-	// like `foo`.
-
-	// Extraction information.
-	Position string `json:"position,omitempty"` // filePosition:line
-}
-
-// Placeholder reports the placeholder for the given ID if it is defined or nil
-// otherwise.
-func (m *Message) Placeholder(id string) *Placeholder {
-	for _, p := range m.Placeholders {
-		if p.ID == id {
-			return &p
-		}
-	}
-	return nil
-}
-
-// Substitute replaces placeholders in msg with their original value.
-func (m *Message) Substitute(msg string) (sub string, err error) {
-	last := 0
-	for i := 0; i < len(msg); {
-		pLeft := strings.IndexByte(msg[i:], '{')
-		if pLeft == -1 {
-			break
-		}
-		pLeft += i
-		pRight := strings.IndexByte(msg[pLeft:], '}')
-		if pRight == -1 {
-			return "", errorf("unmatched '}'")
-		}
-		pRight += pLeft
-		id := strings.TrimSpace(msg[pLeft+1 : pRight])
-		i = pRight + 1
-		if id != "" && id[0] == '$' {
-			continue
-		}
-		sub += msg[last:pLeft]
-		last = i
-		ph := m.Placeholder(id)
-		if ph == nil {
-			return "", errorf("unknown placeholder %q in message %q", id, msg)
-		}
-		sub += ph.String
-	}
-	sub += msg[last:]
-	return sub, err
-}
-
-var errIncompatibleMessage = errors.New("messages incompatible")
-
-func checkEquivalence(a, b *Message) error {
-	for _, v := range a.ID {
-		for _, w := range b.ID {
-			if v == w {
-				return nil
-			}
-		}
-	}
-	// TODO: canonicalize placeholders and check for type equivalence.
-	return errIncompatibleMessage
-}
-
-// A Placeholder is a part of the message that should not be changed by a
-// translator. It can be used to hide or prettify format strings (e.g. %d or
-// {{.Count}}), hide HTML, or mark common names that should not be translated.
-type Placeholder struct {
-	// ID is the placeholder identifier without the curly braces.
-	ID string `json:"id"`
-
-	// String is the string with which to replace the placeholder. This may be a
-	// formatting string (for instance "%d" or "{{.Count}}") or a literal string
-	// (<div>).
-	String string `json:"string"`
-
-	Type           string `json:"type"`
-	UnderlyingType string `json:"underlyingType"`
-	// ArgNum and Expr are set if the placeholder is a substitution of an
-	// argument.
-	ArgNum int    `json:"argNum,omitempty"`
-	Expr   string `json:"expr,omitempty"`
-
-	Comment string `json:"comment,omitempty"`
-	Example string `json:"example,omitempty"`
-
-	// Features contains the features that are available for the implementation
-	// of this argument.
-	Features []Feature `json:"features,omitempty"`
-}
-
-// An argument contains information about the arguments passed to a message.
-type argument struct {
-	// ArgNum corresponds to the number that should be used for explicit argument indexes (e.g.
-	// "%[1]d").
-	ArgNum int `json:"argNum,omitempty"`
-
-	used           bool   // Used by Placeholder
-	Type           string `json:"type"`
-	UnderlyingType string `json:"underlyingType"`
-	Expr           string `json:"expr"`
-	Value          string `json:"value,omitempty"`
-	Comment        string `json:"comment,omitempty"`
-	Position       string `json:"position,omitempty"`
-}
-
-// Feature holds information about a feature that can be implemented by
-// an Argument.
-type Feature struct {
-	Type string `json:"type"` // Right now this is only gender and plural.
-
-	// TODO: possible values and examples for the language under consideration.
-
-}
-
-// Text defines a message to be displayed.
-type Text struct {
-	// Msg and Select contains the message to be displayed. Msg may be used as
-	// a fallback value if none of the select cases match.
-	Msg    string  `json:"msg,omitempty"`
-	Select *Select `json:"select,omitempty"`
-
-	// Var defines a map of variables that may be substituted in the selected
-	// message.
-	Var map[string]Text `json:"var,omitempty"`
-
-	// Example contains an example message formatted with default values.
-	Example string `json:"example,omitempty"`
-}
-
-// IsEmpty reports whether this Text can generate anything.
-func (t *Text) IsEmpty() bool {
-	return t.Msg == "" && t.Select == nil && t.Var == nil
-}
-
-// rawText erases the UnmarshalJSON method.
-type rawText Text
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (t *Text) UnmarshalJSON(b []byte) error {
-	if b[0] == '"' {
-		return json.Unmarshal(b, &t.Msg)
-	}
-	return json.Unmarshal(b, (*rawText)(t))
-}
-
-// MarshalJSON implements json.Marshaler.
-func (t *Text) MarshalJSON() ([]byte, error) {
-	if t.Select == nil && t.Var == nil && t.Example == "" {
-		return json.Marshal(t.Msg)
-	}
-	return json.Marshal((*rawText)(t))
-}
-
-// IDList is a set identifiers that each may refer to possibly different
-// versions of the same message. When looking up a messages, the first
-// identifier in the list takes precedence.
-type IDList []string
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (id *IDList) UnmarshalJSON(b []byte) error {
-	if b[0] == '"' {
-		*id = []string{""}
-		return json.Unmarshal(b, &((*id)[0]))
-	}
-	return json.Unmarshal(b, (*[]string)(id))
-}
-
-// MarshalJSON implements json.Marshaler.
-func (id *IDList) MarshalJSON() ([]byte, error) {
-	if len(*id) == 1 {
-		return json.Marshal((*id)[0])
-	}
-	return json.Marshal((*[]string)(id))
-}
-
-// Select selects a Text based on the feature value associated with a feature of
-// a certain argument.
-type Select struct {
-	Feature string          `json:"feature"` // Name of Feature type (e.g plural)
-	Arg     string          `json:"arg"`     // The placeholder ID
-	Cases   map[string]Text `json:"cases"`
-}
-
-// TODO: order matters, but can we derive the ordering from the case keys?
-// type Case struct {
-// 	Key   string `json:"key"`
-// 	Value Text   `json:"value"`
-// }
diff --git a/vendor/golang.org/x/text/message/pipeline/pipeline.go b/vendor/golang.org/x/text/message/pipeline/pipeline.go
deleted file mode 100644
index cafd6f29b..000000000
--- a/vendor/golang.org/x/text/message/pipeline/pipeline.go
+++ /dev/null
@@ -1,422 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package pipeline provides tools for creating translation pipelines.
-//
-// NOTE: UNDER DEVELOPMENT. API MAY CHANGE.
-package pipeline
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"go/build"
-	"go/parser"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"text/template"
-	"unicode"
-
-	"golang.org/x/text/internal"
-	"golang.org/x/text/language"
-	"golang.org/x/text/runes"
-	"golang.org/x/tools/go/loader"
-)
-
-const (
-	extractFile  = "extracted.gotext.json"
-	outFile      = "out.gotext.json"
-	gotextSuffix = "gotext.json"
-)
-
-// Config contains configuration for the translation pipeline.
-type Config struct {
-	// Supported indicates the languages for which data should be generated.
-	// The default is to support all locales for which there are matching
-	// translation files.
-	Supported []language.Tag
-
-	// --- Extraction
-
-	SourceLanguage language.Tag
-
-	Packages []string
-
-	// --- File structure
-
-	// Dir is the root dir for all operations.
-	Dir string
-
-	// TranslationsPattern is a regular expression to match incoming translation
-	// files. These files may appear in any directory rooted at Dir.
-	// language for the translation files is determined as follows:
-	//   1. From the Language field in the file.
-	//   2. If not present, from a valid language tag in the filename, separated
-	//      by dots (e.g. "en-US.json" or "incoming.pt_PT.xmb").
-	//   3. If not present, from a the closest subdirectory in which the file
-	//      is contained that parses as a valid language tag.
-	TranslationsPattern string
-
-	// OutPattern defines the location for translation files for a certain
-	// language. The default is "{{.Dir}}/{{.Language}}/out.{{.Ext}}"
-	OutPattern string
-
-	// Format defines the file format for generated translation files.
-	// The default is XMB. Alternatives are GetText, XLIFF, L20n, GoText.
-	Format string
-
-	Ext string
-
-	// TODO:
-	// Actions are additional actions to be performed after the initial extract
-	// and merge.
-	// Actions []struct {
-	// 	Name    string
-	// 	Options map[string]string
-	// }
-
-	// --- Generation
-
-	// GenFile may be in a different package. It is not defined, it will
-	// be written to stdout.
-	GenFile string
-
-	// GenPackage is the package or relative path into which to generate the
-	// file. If not specified it is relative to the current directory.
-	GenPackage string
-
-	// DeclareVar defines a variable to which to assing the generated Catalog.
-	DeclareVar string
-
-	// SetDefault determines whether to assign the generated Catalog to
-	// message.DefaultCatalog. The default for this is true if DeclareVar is
-	// not defined, false otherwise.
-	SetDefault bool
-
-	// TODO:
-	// - Printf-style configuration
-	// - Template-style configuration
-	// - Extraction options
-	// - Rewrite options
-	// - Generation options
-}
-
-// Operations:
-// - extract:       get the strings
-// - disambiguate:  find messages with the same key, but possible different meaning.
-// - create out:    create a list of messages that need translations
-// - load trans:    load the list of current translations
-// - merge:         assign list of translations as done
-// - (action)expand:    analyze features and create example sentences for each version.
-// - (action)googletrans:   pre-populate messages with automatic translations.
-// - (action)export:    send out messages somewhere non-standard
-// - (action)import:    load messages from somewhere non-standard
-// - vet program:   don't pass "foo" + var + "bar" strings. Not using funcs for translated strings.
-// - vet trans:     coverage: all translations/ all features.
-// - generate:      generate Go code
-
-// State holds all accumulated information on translations during processing.
-type State struct {
-	Config Config
-
-	Package string
-	program *loader.Program
-
-	Extracted Messages `json:"messages"`
-
-	// Messages includes all messages for which there need to be translations.
-	// Duplicates may be eliminated. Generation will be done from these messages
-	// (usually after merging).
-	Messages []Messages
-
-	// Translations are incoming translations for the application messages.
-	Translations []Messages
-}
-
-func (s *State) dir() string {
-	if d := s.Config.Dir; d != "" {
-		return d
-	}
-	return "./locales"
-}
-
-func outPattern(s *State) (string, error) {
-	c := s.Config
-	pat := c.OutPattern
-	if pat == "" {
-		pat = "{{.Dir}}/{{.Language}}/out.{{.Ext}}"
-	}
-
-	ext := c.Ext
-	if ext == "" {
-		ext = c.Format
-	}
-	if ext == "" {
-		ext = gotextSuffix
-	}
-	t, err := template.New("").Parse(pat)
-	if err != nil {
-		return "", wrap(err, "error parsing template")
-	}
-	buf := bytes.Buffer{}
-	err = t.Execute(&buf, map[string]string{
-		"Dir":      s.dir(),
-		"Language": "%s",
-		"Ext":      ext,
-	})
-	return filepath.FromSlash(buf.String()), wrap(err, "incorrect OutPattern")
-}
-
-var transRE = regexp.MustCompile(`.*\.` + gotextSuffix)
-
-// Import loads existing translation files.
-func (s *State) Import() error {
-	outPattern, err := outPattern(s)
-	if err != nil {
-		return err
-	}
-	re := transRE
-	if pat := s.Config.TranslationsPattern; pat != "" {
-		if re, err = regexp.Compile(pat); err != nil {
-			return wrapf(err, "error parsing regexp %q", s.Config.TranslationsPattern)
-		}
-	}
-	x := importer{s, outPattern, re}
-	return x.walkImport(s.dir(), s.Config.SourceLanguage)
-}
-
-type importer struct {
-	state      *State
-	outPattern string
-	transFile  *regexp.Regexp
-}
-
-func (i *importer) walkImport(path string, tag language.Tag) error {
-	files, err := ioutil.ReadDir(path)
-	if err != nil {
-		return nil
-	}
-	for _, f := range files {
-		name := f.Name()
-		tag := tag
-		if f.IsDir() {
-			if t, err := language.Parse(name); err == nil {
-				tag = t
-			}
-			// We ignore errors
-			if err := i.walkImport(filepath.Join(path, name), tag); err != nil {
-				return err
-			}
-			continue
-		}
-		for _, l := range strings.Split(name, ".") {
-			if t, err := language.Parse(l); err == nil {
-				tag = t
-			}
-		}
-		file := filepath.Join(path, name)
-		// TODO: Should we skip files that match output files?
-		if fmt.Sprintf(i.outPattern, tag) == file {
-			continue
-		}
-		// TODO: handle different file formats.
-		if !i.transFile.MatchString(name) {
-			continue
-		}
-		b, err := ioutil.ReadFile(file)
-		if err != nil {
-			return wrap(err, "read file failed")
-		}
-		var translations Messages
-		if err := json.Unmarshal(b, &translations); err != nil {
-			return wrap(err, "parsing translation file failed")
-		}
-		i.state.Translations = append(i.state.Translations, translations)
-	}
-	return nil
-}
-
-// Merge merges the extracted messages with the existing translations.
-func (s *State) Merge() error {
-	if s.Messages != nil {
-		panic("already merged")
-	}
-	// Create an index for each unique message.
-	// Duplicates are okay as long as the substitution arguments are okay as
-	// well.
-	// Top-level messages are okay to appear in multiple substitution points.
-
-	// Collect key equivalence.
-	msgs := []*Message{}
-	keyToIDs := map[string]*Message{}
-	for _, m := range s.Extracted.Messages {
-		m := m
-		if prev, ok := keyToIDs[m.Key]; ok {
-			if err := checkEquivalence(&m, prev); err != nil {
-				warnf("Key %q matches conflicting messages: %v and %v", m.Key, prev.ID, m.ID)
-				// TODO: track enough information so that the rewriter can
-				// suggest/disambiguate messages.
-			}
-			// TODO: add position to message.
-			continue
-		}
-		i := len(msgs)
-		msgs = append(msgs, &m)
-		keyToIDs[m.Key] = msgs[i]
-	}
-
-	// Messages with different keys may still refer to the same translated
-	// message (e.g. different whitespace). Filter these.
-	idMap := map[string]bool{}
-	filtered := []*Message{}
-	for _, m := range msgs {
-		found := false
-		for _, id := range m.ID {
-			found = found || idMap[id]
-		}
-		if !found {
-			filtered = append(filtered, m)
-		}
-		for _, id := range m.ID {
-			idMap[id] = true
-		}
-	}
-
-	// Build index of translations.
-	translations := map[language.Tag]map[string]Message{}
-	languages := append([]language.Tag{}, s.Config.Supported...)
-
-	for _, t := range s.Translations {
-		tag := t.Language
-		if _, ok := translations[tag]; !ok {
-			translations[tag] = map[string]Message{}
-			languages = append(languages, tag)
-		}
-		for _, m := range t.Messages {
-			if !m.Translation.IsEmpty() {
-				for _, id := range m.ID {
-					if _, ok := translations[tag][id]; ok {
-						warnf("Duplicate translation in locale %q for message %q", tag, id)
-					}
-					translations[tag][id] = m
-				}
-			}
-		}
-	}
-	languages = internal.UniqueTags(languages)
-
-	for _, tag := range languages {
-		ms := Messages{Language: tag}
-		for _, orig := range filtered {
-			m := *orig
-			m.Key = ""
-			m.Position = ""
-
-			for _, id := range m.ID {
-				if t, ok := translations[tag][id]; ok {
-					m.Translation = t.Translation
-					if t.TranslatorComment != "" {
-						m.TranslatorComment = t.TranslatorComment
-						m.Fuzzy = t.Fuzzy
-					}
-					break
-				}
-			}
-			if tag == s.Config.SourceLanguage && m.Translation.IsEmpty() {
-				m.Translation = m.Message
-				if m.TranslatorComment == "" {
-					m.TranslatorComment = "Copied from source."
-					m.Fuzzy = true
-				}
-			}
-			// TODO: if translation is empty: pre-expand based on available
-			// linguistic features. This may also be done as a plugin.
-			ms.Messages = append(ms.Messages, m)
-		}
-		s.Messages = append(s.Messages, ms)
-	}
-	return nil
-}
-
-// Export writes out the messages to translation out files.
-func (s *State) Export() error {
-	path, err := outPattern(s)
-	if err != nil {
-		return wrap(err, "export failed")
-	}
-	for _, out := range s.Messages {
-		// TODO: inject translations from existing files to avoid retranslation.
-		data, err := json.MarshalIndent(out, "", "    ")
-		if err != nil {
-			return wrap(err, "JSON marshal failed")
-		}
-		file := fmt.Sprintf(path, out.Language)
-		if err := os.MkdirAll(filepath.Dir(file), 0755); err != nil {
-			return wrap(err, "dir create failed")
-		}
-		if err := ioutil.WriteFile(file, data, 0644); err != nil {
-			return wrap(err, "write failed")
-		}
-	}
-	return nil
-}
-
-var (
-	ws    = runes.In(unicode.White_Space).Contains
-	notWS = runes.NotIn(unicode.White_Space).Contains
-)
-
-func trimWS(s string) (trimmed, leadWS, trailWS string) {
-	trimmed = strings.TrimRightFunc(s, ws)
-	trailWS = s[len(trimmed):]
-	if i := strings.IndexFunc(trimmed, notWS); i > 0 {
-		leadWS = trimmed[:i]
-		trimmed = trimmed[i:]
-	}
-	return trimmed, leadWS, trailWS
-}
-
-// NOTE: The command line tool already prefixes with "gotext:".
-var (
-	wrap = func(err error, msg string) error {
-		if err == nil {
-			return nil
-		}
-		return fmt.Errorf("%s: %v", msg, err)
-	}
-	wrapf = func(err error, msg string, args ...interface{}) error {
-		if err == nil {
-			return nil
-		}
-		return wrap(err, fmt.Sprintf(msg, args...))
-	}
-	errorf = fmt.Errorf
-)
-
-func warnf(format string, args ...interface{}) {
-	// TODO: don't log.
-	log.Printf(format, args...)
-}
-
-func loadPackages(conf *loader.Config, args []string) (*loader.Program, error) {
-	if len(args) == 0 {
-		args = []string{"."}
-	}
-
-	conf.Build = &build.Default
-	conf.ParserMode = parser.ParseComments
-
-	// Use the initial packages from the command line.
-	args, err := conf.FromArgs(args, false)
-	if err != nil {
-		return nil, wrap(err, "loading packages failed")
-	}
-
-	// Load, parse and type-check the whole program.
-	return conf.Load()
-}
diff --git a/vendor/golang.org/x/text/message/pipeline/pipeline_test.go b/vendor/golang.org/x/text/message/pipeline/pipeline_test.go
deleted file mode 100644
index 293101b25..000000000
--- a/vendor/golang.org/x/text/message/pipeline/pipeline_test.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pipeline
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"golang.org/x/text/language"
-)
-
-var genFiles = flag.Bool("gen", false, "generate output files instead of comparing")
-
-// setHelper is testing.T.Helper on Go 1.9+, overridden by go19_test.go.
-var setHelper = func(t *testing.T) {}
-
-func TestFullCycle(t *testing.T) {
-	const path = "./testdata"
-	dirs, err := ioutil.ReadDir(path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, f := range dirs {
-		t.Run(f.Name(), func(t *testing.T) {
-			chk := func(t *testing.T, err error) {
-				setHelper(t)
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-			dir := filepath.Join(path, f.Name())
-			pkgPath := fmt.Sprintf("%s/%s", path, f.Name())
-			config := Config{
-				SourceLanguage: language.AmericanEnglish,
-				Packages:       []string{pkgPath},
-				Dir:            filepath.Join(dir, "locales"),
-				GenFile:        "catalog_gen.go",
-				GenPackage:     pkgPath,
-			}
-			// TODO: load config if available.
-			s, err := Extract(&config)
-			chk(t, err)
-			chk(t, s.Import())
-			chk(t, s.Merge())
-			// TODO:
-			//  for range s.Config.Actions {
-			//  	//  TODO: do the actions.
-			//  }
-			chk(t, s.Export())
-			chk(t, s.Generate())
-
-			writeJSON(t, filepath.Join(dir, "extracted.gotext.json"), s.Extracted)
-			checkOutput(t, dir)
-		})
-	}
-}
-
-func checkOutput(t *testing.T, p string) {
-	filepath.Walk(p, func(p string, f os.FileInfo, err error) error {
-		if f.IsDir() {
-			return nil
-		}
-		if filepath.Ext(p) != ".want" {
-			return nil
-		}
-		gotFile := p[:len(p)-len(".want")]
-		got, err := ioutil.ReadFile(gotFile)
-		if err != nil {
-			t.Errorf("failed to read %q", p)
-			return nil
-		}
-		if *genFiles {
-			if err := ioutil.WriteFile(p, got, 0644); err != nil {
-				t.Fatal(err)
-			}
-		}
-		want, err := ioutil.ReadFile(p)
-		if err != nil {
-			t.Errorf("failed to read %q", p)
-		} else {
-			scanGot := bufio.NewScanner(bytes.NewReader(got))
-			scanWant := bufio.NewScanner(bytes.NewReader(want))
-			line := 0
-			clean := func(s string) string {
-				if i := strings.LastIndex(s, "//"); i != -1 {
-					s = s[:i]
-				}
-				return path.Clean(filepath.ToSlash(s))
-			}
-			for scanGot.Scan() && scanWant.Scan() {
-				got := clean(scanGot.Text())
-				want := clean(scanWant.Text())
-				if got != want {
-					t.Errorf("file %q differs from .want file at line %d:\n\t%s\n\t%s", gotFile, line, got, want)
-					break
-				}
-				line++
-			}
-			if scanGot.Scan() || scanWant.Scan() {
-				t.Errorf("file %q differs from .want file at line %d.", gotFile, line)
-			}
-		}
-		return nil
-	})
-}
-
-func writeJSON(t *testing.T, path string, x interface{}) {
-	data, err := json.MarshalIndent(x, "", "    ")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(path, data, 0644); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/vendor/golang.org/x/text/message/pipeline/rewrite.go b/vendor/golang.org/x/text/message/pipeline/rewrite.go
deleted file mode 100644
index cf1511f56..000000000
--- a/vendor/golang.org/x/text/message/pipeline/rewrite.go
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pipeline
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/constant"
-	"go/format"
-	"go/token"
-	"io"
-	"os"
-	"strings"
-
-	"golang.org/x/tools/go/loader"
-)
-
-const printerType = "golang.org/x/text/message.Printer"
-
-// Rewrite rewrites the Go files in a single package to use the localization
-// machinery and rewrites strings to adopt best practices when possible.
-// If w is not nil the generated files are written to it, each files with a
-// "--- <filename>" header. Otherwise the files are overwritten.
-func Rewrite(w io.Writer, args ...string) error {
-	conf := &loader.Config{
-		AllowErrors: true, // Allow unused instances of message.Printer.
-	}
-	prog, err := loadPackages(conf, args)
-	if err != nil {
-		return wrap(err, "")
-	}
-
-	for _, info := range prog.InitialPackages() {
-		for _, f := range info.Files {
-			// Associate comments with nodes.
-
-			// Pick up initialized Printers at the package level.
-			r := rewriter{info: info, conf: conf}
-			for _, n := range info.InitOrder {
-				if t := r.info.Types[n.Rhs].Type.String(); strings.HasSuffix(t, printerType) {
-					r.printerVar = n.Lhs[0].Name()
-				}
-			}
-
-			ast.Walk(&r, f)
-
-			w := w
-			if w == nil {
-				var err error
-				if w, err = os.Create(conf.Fset.File(f.Pos()).Name()); err != nil {
-					return wrap(err, "open failed")
-				}
-			} else {
-				fmt.Fprintln(w, "---", conf.Fset.File(f.Pos()).Name())
-			}
-
-			if err := format.Node(w, conf.Fset, f); err != nil {
-				return wrap(err, "go format failed")
-			}
-		}
-	}
-
-	return nil
-}
-
-type rewriter struct {
-	info       *loader.PackageInfo
-	conf       *loader.Config
-	printerVar string
-}
-
-// print returns Go syntax for the specified node.
-func (r *rewriter) print(n ast.Node) string {
-	var buf bytes.Buffer
-	format.Node(&buf, r.conf.Fset, n)
-	return buf.String()
-}
-
-func (r *rewriter) Visit(n ast.Node) ast.Visitor {
-	// Save the state by scope.
-	if _, ok := n.(*ast.BlockStmt); ok {
-		r := *r
-		return &r
-	}
-	// Find Printers created by assignment.
-	stmt, ok := n.(*ast.AssignStmt)
-	if ok {
-		for _, v := range stmt.Lhs {
-			if r.printerVar == r.print(v) {
-				r.printerVar = ""
-			}
-		}
-		for i, v := range stmt.Rhs {
-			if t := r.info.Types[v].Type.String(); strings.HasSuffix(t, printerType) {
-				r.printerVar = r.print(stmt.Lhs[i])
-				return r
-			}
-		}
-	}
-	// Find Printers created by variable declaration.
-	spec, ok := n.(*ast.ValueSpec)
-	if ok {
-		for _, v := range spec.Names {
-			if r.printerVar == r.print(v) {
-				r.printerVar = ""
-			}
-		}
-		for i, v := range spec.Values {
-			if t := r.info.Types[v].Type.String(); strings.HasSuffix(t, printerType) {
-				r.printerVar = r.print(spec.Names[i])
-				return r
-			}
-		}
-	}
-	if r.printerVar == "" {
-		return r
-	}
-	call, ok := n.(*ast.CallExpr)
-	if !ok {
-		return r
-	}
-
-	// TODO: Handle literal values?
-	sel, ok := call.Fun.(*ast.SelectorExpr)
-	if !ok {
-		return r
-	}
-	meth := r.info.Selections[sel]
-
-	source := r.print(sel.X)
-	fun := r.print(sel.Sel)
-	if meth != nil {
-		source = meth.Recv().String()
-		fun = meth.Obj().Name()
-	}
-
-	// TODO: remove cheap hack and check if the type either
-	// implements some interface or is specifically of type
-	// "golang.org/x/text/message".Printer.
-	m, ok := rewriteFuncs[source]
-	if !ok {
-		return r
-	}
-
-	rewriteType, ok := m[fun]
-	if !ok {
-		return r
-	}
-	ident := ast.NewIdent(r.printerVar)
-	ident.NamePos = sel.X.Pos()
-	sel.X = ident
-	if rewriteType.method != "" {
-		sel.Sel.Name = rewriteType.method
-	}
-
-	// Analyze arguments.
-	argn := rewriteType.arg
-	if rewriteType.format || argn >= len(call.Args) {
-		return r
-	}
-	hasConst := false
-	for _, a := range call.Args[argn:] {
-		if v := r.info.Types[a].Value; v != nil && v.Kind() == constant.String {
-			hasConst = true
-			break
-		}
-	}
-	if !hasConst {
-		return r
-	}
-	sel.Sel.Name = rewriteType.methodf
-
-	// We are done if there is only a single string that does not need to be
-	// escaped.
-	if len(call.Args) == 1 {
-		s, ok := constStr(r.info, call.Args[0])
-		if ok && !strings.Contains(s, "%") && !rewriteType.newLine {
-			return r
-		}
-	}
-
-	// Rewrite arguments as format string.
-	expr := &ast.BasicLit{
-		ValuePos: call.Lparen,
-		Kind:     token.STRING,
-	}
-	newArgs := append(call.Args[:argn:argn], expr)
-	newStr := []string{}
-	for i, a := range call.Args[argn:] {
-		if s, ok := constStr(r.info, a); ok {
-			newStr = append(newStr, strings.Replace(s, "%", "%%", -1))
-		} else {
-			newStr = append(newStr, "%v")
-			newArgs = append(newArgs, call.Args[argn+i])
-		}
-	}
-	s := strings.Join(newStr, rewriteType.sep)
-	if rewriteType.newLine {
-		s += "\n"
-	}
-	expr.Value = fmt.Sprintf("%q", s)
-
-	call.Args = newArgs
-
-	// TODO: consider creating an expression instead of a constant string and
-	// then wrapping it in an escape function or so:
-	// call.Args[argn+i] = &ast.CallExpr{
-	// 		Fun: &ast.SelectorExpr{
-	// 			X:   ast.NewIdent("message"),
-	// 			Sel: ast.NewIdent("Lookup"),
-	// 		},
-	// 		Args: []ast.Expr{a},
-	// 	}
-	// }
-
-	return r
-}
-
-type rewriteType struct {
-	// method is the name of the equivalent method on a printer, or "" if it is
-	// the same.
-	method string
-
-	// methodf is the method to use if the arguments can be rewritten as a
-	// arguments to a printf-style call.
-	methodf string
-
-	// format is true if the method takes a formatting string followed by
-	// substitution arguments.
-	format bool
-
-	// arg indicates the position of the argument to extract. If all is
-	// positive, all arguments from this argument onwards needs to be extracted.
-	arg int
-
-	sep     string
-	newLine bool
-}
-
-// rewriteFuncs list functions that can be directly mapped to the printer
-// functions of the message package.
-var rewriteFuncs = map[string]map[string]rewriteType{
-	// TODO: Printer -> *golang.org/x/text/message.Printer
-	"fmt": {
-		"Print":  rewriteType{methodf: "Printf"},
-		"Sprint": rewriteType{methodf: "Sprintf"},
-		"Fprint": rewriteType{methodf: "Fprintf"},
-
-		"Println":  rewriteType{methodf: "Printf", sep: " ", newLine: true},
-		"Sprintln": rewriteType{methodf: "Sprintf", sep: " ", newLine: true},
-		"Fprintln": rewriteType{methodf: "Fprintf", sep: " ", newLine: true},
-
-		"Printf":  rewriteType{method: "Printf", format: true},
-		"Sprintf": rewriteType{method: "Sprintf", format: true},
-		"Fprintf": rewriteType{method: "Fprintf", format: true},
-	},
-}
-
-func constStr(info *loader.PackageInfo, e ast.Expr) (s string, ok bool) {
-	v := info.Types[e].Value
-	if v == nil || v.Kind() != constant.String {
-		return "", false
-	}
-	return constant.StringVal(v), true
-}
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/catalog_gen.go b/vendor/golang.org/x/text/message/pipeline/testdata/test1/catalog_gen.go
deleted file mode 100644
index 7d93f4868..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/catalog_gen.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package main
-
-import (
-	"golang.org/x/text/language"
-	"golang.org/x/text/message"
-	"golang.org/x/text/message/catalog"
-)
-
-type dictionary struct {
-	index []uint32
-	data  string
-}
-
-func (d *dictionary) Lookup(key string) (data string, ok bool) {
-	p := messageKeyToIndex[key]
-	start, end := d.index[p], d.index[p+1]
-	if start == end {
-		return "", false
-	}
-	return d.data[start:end], true
-}
-
-func init() {
-	dict := map[string]catalog.Dictionary{
-		"de":    &dictionary{index: deIndex, data: deData},
-		"en_US": &dictionary{index: en_USIndex, data: en_USData},
-		"zh":    &dictionary{index: zhIndex, data: zhData},
-	}
-	fallback := language.MustParse("en-US")
-	cat, err := catalog.NewFromMap(dict, catalog.Fallback(fallback))
-	if err != nil {
-		panic(err)
-	}
-	message.DefaultCatalog = cat
-}
-
-var messageKeyToIndex = map[string]int{
-	"%.2[1]f miles traveled (%[1]f)":                 8,
-	"%[1]s is visiting %[3]s!\n":                     3,
-	"%d files remaining!":                            4,
-	"%d more files remaining!":                       5,
-	"%s is out of order!":                            7,
-	"%s is visiting %s!\n":                           2,
-	"Hello %s!\n":                                    1,
-	"Hello world!\n":                                 0,
-	"Use the following code for your discount: %d\n": 6,
-}
-
-var deIndex = []uint32{ // 10 elements
-	0x00000000, 0x00000011, 0x00000023, 0x0000003d,
-	0x00000057, 0x00000075, 0x00000094, 0x00000094,
-	0x00000094, 0x00000094,
-} // Size: 64 bytes
-
-const deData string = "" + // Size: 148 bytes
-	"\x04\x00\x01\x0a\x0c\x02Hallo Welt!\x04\x00\x01\x0a\x0d\x02Hallo %[1]s!" +
-	"\x04\x00\x01\x0a\x15\x02%[1]s besucht %[2]s!\x04\x00\x01\x0a\x15\x02%[1]" +
-	"s besucht %[3]s!\x02Noch zwei Bestände zu gehen!\x02Noch %[1]d Bestände " +
-	"zu gehen!"
-
-var en_USIndex = []uint32{ // 10 elements
-	0x00000000, 0x00000012, 0x00000024, 0x00000042,
-	0x00000060, 0x00000077, 0x000000ba, 0x000000ef,
-	0x00000106, 0x00000125,
-} // Size: 64 bytes
-
-const en_USData string = "" + // Size: 293 bytes
-	"\x04\x00\x01\x0a\x0d\x02Hello world!\x04\x00\x01\x0a\x0d\x02Hello %[1]s!" +
-	"\x04\x00\x01\x0a\x19\x02%[1]s is visiting %[2]s!\x04\x00\x01\x0a\x19\x02" +
-	"%[1]s is visiting %[3]s!\x02%[1]d files remaining!\x14\x01\x81\x01\x00" +
-	"\x02\x14\x02One file remaining!\x00&\x02There are %[1]d more files remai" +
-	"ning!\x04\x00\x01\x0a0\x02Use the following code for your discount: %[1]" +
-	"d\x02%[1]s is out of order!\x02%.2[1]f miles traveled (%[1]f)"
-
-var zhIndex = []uint32{ // 10 elements
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000,
-} // Size: 64 bytes
-
-const zhData string = ""
-
-// Total table size 633 bytes (0KiB); checksum: 74B32E70
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/catalog_gen.go.want b/vendor/golang.org/x/text/message/pipeline/testdata/test1/catalog_gen.go.want
deleted file mode 100644
index 7d93f4868..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/catalog_gen.go.want
+++ /dev/null
@@ -1,85 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package main
-
-import (
-	"golang.org/x/text/language"
-	"golang.org/x/text/message"
-	"golang.org/x/text/message/catalog"
-)
-
-type dictionary struct {
-	index []uint32
-	data  string
-}
-
-func (d *dictionary) Lookup(key string) (data string, ok bool) {
-	p := messageKeyToIndex[key]
-	start, end := d.index[p], d.index[p+1]
-	if start == end {
-		return "", false
-	}
-	return d.data[start:end], true
-}
-
-func init() {
-	dict := map[string]catalog.Dictionary{
-		"de":    &dictionary{index: deIndex, data: deData},
-		"en_US": &dictionary{index: en_USIndex, data: en_USData},
-		"zh":    &dictionary{index: zhIndex, data: zhData},
-	}
-	fallback := language.MustParse("en-US")
-	cat, err := catalog.NewFromMap(dict, catalog.Fallback(fallback))
-	if err != nil {
-		panic(err)
-	}
-	message.DefaultCatalog = cat
-}
-
-var messageKeyToIndex = map[string]int{
-	"%.2[1]f miles traveled (%[1]f)":                 8,
-	"%[1]s is visiting %[3]s!\n":                     3,
-	"%d files remaining!":                            4,
-	"%d more files remaining!":                       5,
-	"%s is out of order!":                            7,
-	"%s is visiting %s!\n":                           2,
-	"Hello %s!\n":                                    1,
-	"Hello world!\n":                                 0,
-	"Use the following code for your discount: %d\n": 6,
-}
-
-var deIndex = []uint32{ // 10 elements
-	0x00000000, 0x00000011, 0x00000023, 0x0000003d,
-	0x00000057, 0x00000075, 0x00000094, 0x00000094,
-	0x00000094, 0x00000094,
-} // Size: 64 bytes
-
-const deData string = "" + // Size: 148 bytes
-	"\x04\x00\x01\x0a\x0c\x02Hallo Welt!\x04\x00\x01\x0a\x0d\x02Hallo %[1]s!" +
-	"\x04\x00\x01\x0a\x15\x02%[1]s besucht %[2]s!\x04\x00\x01\x0a\x15\x02%[1]" +
-	"s besucht %[3]s!\x02Noch zwei Bestände zu gehen!\x02Noch %[1]d Bestände " +
-	"zu gehen!"
-
-var en_USIndex = []uint32{ // 10 elements
-	0x00000000, 0x00000012, 0x00000024, 0x00000042,
-	0x00000060, 0x00000077, 0x000000ba, 0x000000ef,
-	0x00000106, 0x00000125,
-} // Size: 64 bytes
-
-const en_USData string = "" + // Size: 293 bytes
-	"\x04\x00\x01\x0a\x0d\x02Hello world!\x04\x00\x01\x0a\x0d\x02Hello %[1]s!" +
-	"\x04\x00\x01\x0a\x19\x02%[1]s is visiting %[2]s!\x04\x00\x01\x0a\x19\x02" +
-	"%[1]s is visiting %[3]s!\x02%[1]d files remaining!\x14\x01\x81\x01\x00" +
-	"\x02\x14\x02One file remaining!\x00&\x02There are %[1]d more files remai" +
-	"ning!\x04\x00\x01\x0a0\x02Use the following code for your discount: %[1]" +
-	"d\x02%[1]s is out of order!\x02%.2[1]f miles traveled (%[1]f)"
-
-var zhIndex = []uint32{ // 10 elements
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000,
-} // Size: 64 bytes
-
-const zhData string = ""
-
-// Total table size 633 bytes (0KiB); checksum: 74B32E70
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/catalog_test.go b/vendor/golang.org/x/text/message/pipeline/testdata/test1/catalog_test.go
deleted file mode 100644
index eeb7c25f4..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/catalog_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"path"
-	"testing"
-
-	"golang.org/x/text/message"
-)
-
-func TestCatalog(t *testing.T) {
-	args := func(a ...interface{}) []interface{} { return a }
-	testCases := []struct {
-		lang string
-		key  string
-		args []interface{}
-		want string
-	}{{
-		lang: "en",
-		key:  "Hello world!\n",
-		want: "Hello world!\n",
-	}, {
-		lang: "de",
-		key:  "Hello world!\n",
-		want: "Hallo Welt!\n",
-	}, {
-		lang: "en",
-		key:  "%d more files remaining!",
-		args: args(1),
-		want: "One file remaining!",
-	}, {
-		lang: "en-u-nu-fullwide",
-		key:  "%d more files remaining!",
-		args: args(5),
-		want: "There are ５ more files remaining!",
-	}}
-	for _, tc := range testCases {
-		t.Run(path.Join(tc.lang, tc.key), func(t *testing.T) {
-			p := message.NewPrinter(message.MatchLanguage(tc.lang))
-			got := p.Sprintf(tc.key, tc.args...)
-			if got != tc.want {
-				t.Errorf("got %q; want %q", got, tc.want)
-			}
-		})
-	}
-}
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/extracted.gotext.json b/vendor/golang.org/x/text/message/pipeline/testdata/test1/extracted.gotext.json
deleted file mode 100644
index 4d317af59..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/extracted.gotext.json
+++ /dev/null
@@ -1,188 +0,0 @@
-{
-    "language": "en-US",
-    "messages": [
-        {
-            "id": "Hello world!",
-            "key": "Hello world!\n",
-            "message": "Hello world!",
-            "translation": "",
-            "position": "testdata/test1/test1.go:19:10"
-        },
-        {
-            "id": "Hello {City}!",
-            "key": "Hello %s!\n",
-            "message": "Hello {City}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "City",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "city"
-                }
-            ],
-            "position": "testdata/test1/test1.go:24:10"
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "key": "%s is visiting %s!\n",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "person",
-                    "comment": "The person of matter."
-                },
-                {
-                    "id": "Place",
-                    "string": "%[2]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 2,
-                    "expr": "place",
-                    "comment": "Place the person is visiting."
-                }
-            ],
-            "position": "testdata/test1/test1.go:30:10"
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "key": "%[1]s is visiting %[3]s!\n",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "",
-            "comment": "Field names are placeholders.",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "pp.Person"
-                },
-                {
-                    "id": "Place",
-                    "string": "%[3]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 3,
-                    "expr": "pp.Place",
-                    "comment": "Place the person is visiting."
-                },
-                {
-                    "id": "Extra",
-                    "string": "%[2]v",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 2,
-                    "expr": "pp.extra"
-                }
-            ],
-            "position": "testdata/test1/test1.go:44:10"
-        },
-        {
-            "id": "{2} files remaining!",
-            "key": "%d files remaining!",
-            "message": "{2} files remaining!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "2",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "2"
-                }
-            ],
-            "position": "testdata/test1/test1.go:51:10"
-        },
-        {
-            "id": "{N} more files remaining!",
-            "key": "%d more files remaining!",
-            "message": "{N} more files remaining!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "N",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "n"
-                }
-            ],
-            "position": "testdata/test1/test1.go:56:10"
-        },
-        {
-            "id": "Use the following code for your discount: {ReferralCode}",
-            "key": "Use the following code for your discount: %d\n",
-            "message": "Use the following code for your discount: {ReferralCode}",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "ReferralCode",
-                    "string": "%[1]d",
-                    "type": "./testdata/test1.referralCode",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "c"
-                }
-            ],
-            "position": "testdata/test1/test1.go:64:10"
-        },
-        {
-            "id": [
-                "msgOutOfOrder",
-                "{Device} is out of order!"
-            ],
-            "key": "%s is out of order!",
-            "message": "{Device} is out of order!",
-            "translation": "",
-            "comment": "This comment wins.\n",
-            "placeholders": [
-                {
-                    "id": "Device",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "device"
-                }
-            ],
-            "position": "testdata/test1/test1.go:70:10"
-        },
-        {
-            "id": "{Miles} miles traveled ({Miles_1})",
-            "key": "%.2[1]f miles traveled (%[1]f)",
-            "message": "{Miles} miles traveled ({Miles_1})",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Miles",
-                    "string": "%.2[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                },
-                {
-                    "id": "Miles_1",
-                    "string": "%[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                }
-            ],
-            "position": "testdata/test1/test1.go:74:10"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/extracted.gotext.json.want b/vendor/golang.org/x/text/message/pipeline/testdata/test1/extracted.gotext.json.want
deleted file mode 100644
index 4d317af59..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/extracted.gotext.json.want
+++ /dev/null
@@ -1,188 +0,0 @@
-{
-    "language": "en-US",
-    "messages": [
-        {
-            "id": "Hello world!",
-            "key": "Hello world!\n",
-            "message": "Hello world!",
-            "translation": "",
-            "position": "testdata/test1/test1.go:19:10"
-        },
-        {
-            "id": "Hello {City}!",
-            "key": "Hello %s!\n",
-            "message": "Hello {City}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "City",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "city"
-                }
-            ],
-            "position": "testdata/test1/test1.go:24:10"
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "key": "%s is visiting %s!\n",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "person",
-                    "comment": "The person of matter."
-                },
-                {
-                    "id": "Place",
-                    "string": "%[2]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 2,
-                    "expr": "place",
-                    "comment": "Place the person is visiting."
-                }
-            ],
-            "position": "testdata/test1/test1.go:30:10"
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "key": "%[1]s is visiting %[3]s!\n",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "",
-            "comment": "Field names are placeholders.",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "pp.Person"
-                },
-                {
-                    "id": "Place",
-                    "string": "%[3]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 3,
-                    "expr": "pp.Place",
-                    "comment": "Place the person is visiting."
-                },
-                {
-                    "id": "Extra",
-                    "string": "%[2]v",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 2,
-                    "expr": "pp.extra"
-                }
-            ],
-            "position": "testdata/test1/test1.go:44:10"
-        },
-        {
-            "id": "{2} files remaining!",
-            "key": "%d files remaining!",
-            "message": "{2} files remaining!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "2",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "2"
-                }
-            ],
-            "position": "testdata/test1/test1.go:51:10"
-        },
-        {
-            "id": "{N} more files remaining!",
-            "key": "%d more files remaining!",
-            "message": "{N} more files remaining!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "N",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "n"
-                }
-            ],
-            "position": "testdata/test1/test1.go:56:10"
-        },
-        {
-            "id": "Use the following code for your discount: {ReferralCode}",
-            "key": "Use the following code for your discount: %d\n",
-            "message": "Use the following code for your discount: {ReferralCode}",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "ReferralCode",
-                    "string": "%[1]d",
-                    "type": "./testdata/test1.referralCode",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "c"
-                }
-            ],
-            "position": "testdata/test1/test1.go:64:10"
-        },
-        {
-            "id": [
-                "msgOutOfOrder",
-                "{Device} is out of order!"
-            ],
-            "key": "%s is out of order!",
-            "message": "{Device} is out of order!",
-            "translation": "",
-            "comment": "This comment wins.\n",
-            "placeholders": [
-                {
-                    "id": "Device",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "device"
-                }
-            ],
-            "position": "testdata/test1/test1.go:70:10"
-        },
-        {
-            "id": "{Miles} miles traveled ({Miles_1})",
-            "key": "%.2[1]f miles traveled (%[1]f)",
-            "message": "{Miles} miles traveled ({Miles_1})",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Miles",
-                    "string": "%.2[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                },
-                {
-                    "id": "Miles_1",
-                    "string": "%[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                }
-            ],
-            "position": "testdata/test1/test1.go:74:10"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/de/messages.gotext.json b/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/de/messages.gotext.json
deleted file mode 100755
index f92e4a1f5..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/de/messages.gotext.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "language": "de",
-    "messages": [
-        {
-            "id": "Hello world!",
-            "key": "Hello world!\n",
-            "message": "Hello world!",
-            "translation": "Hallo Welt!"
-        },
-        {
-            "id": "Hello {City}!",
-            "key": "Hello %s!\n",
-            "message": "Hello {City}!",
-            "translation": "Hallo {City}!",
-            "placeholders": [
-                {
-                    "id": "City",
-                    "string": "%[1]s"
-                }
-            ]
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "key": "%s is visiting %s!\n",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "{Person} besucht {Place}!",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s"
-                },
-                {
-                    "id": "Place",
-                    "string": "%[2]s"
-                }
-            ]
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "key": "%[1]s is visiting %[3]s!\n",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "{Person} besucht {Place}!",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s"
-                },
-                {
-                    "id": "Place",
-                    "string": "%[3]s"
-                },
-                {
-                    "id": "Extra",
-                    "string": "%[2]v"
-                }
-            ]
-        },
-        {
-            "id": "{2} files remaining!",
-            "key": "%d files remaining!",
-            "message": "{N} files remaining!",
-            "translation": "Noch zwei Bestände zu gehen!",
-            "placeholders": [
-                {
-                    "id": "2",
-                    "string": "%[1]d"
-                }
-            ]
-        },
-        {
-            "id": "{N} more files remaining!",
-            "key": "%d more files remaining!",
-            "message": "{N} more files remaining!",
-            "translation": "Noch {N} Bestände zu gehen!",
-            "placeholders": [
-                {
-                    "id": "N",
-                    "string": "%[1]d"
-                }
-            ]
-        },
-        {
-            "id": "Use the following code for your discount: {ReferralCode}",
-            "key": "Use the following code for your discount: %d\n",
-            "message": "Use the following code for your discount: {ReferralCode}",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "ReferralCode",
-                    "string": "%[1]d"
-                }
-            ]
-        },
-        {
-            "id": [ "msgOutOfOrder", "{Device} is out of order!" ],
-            "key": "%s is out of order!",
-            "message": "{Device} is out of order!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Device",
-                    "string": "%[1]s"
-                }
-            ]
-        },
-        {
-            "id": "{Miles} miles traveled ({Miles_1})",
-            "key": "%.2[1]f miles traveled (%[1]f)",
-            "message": "{Miles} miles traveled ({Miles_1})",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Miles",
-                    "string": "%.2[1]f"
-                },
-                {
-                    "id": "Miles_1",
-                    "string": "%[1]f"
-                }
-            ]
-        }
-    ]
-}
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/de/out.gotext.json b/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/de/out.gotext.json
deleted file mode 100755
index f19e21d72..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/de/out.gotext.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-    "language": "de",
-    "messages": [
-        {
-            "id": "Hello world!",
-            "message": "Hello world!",
-            "translation": "Hallo Welt!"
-        },
-        {
-            "id": "Hello {City}!",
-            "message": "Hello {City}!",
-            "translation": "Hallo {City}!",
-            "placeholders": [
-                {
-                    "id": "City",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "city"
-                }
-            ]
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "{Person} besucht {Place}!",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "person",
-                    "comment": "The person of matter."
-                },
-                {
-                    "id": "Place",
-                    "string": "%[2]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 2,
-                    "expr": "place",
-                    "comment": "Place the person is visiting."
-                }
-            ]
-        },
-        {
-            "id": "{2} files remaining!",
-            "message": "{2} files remaining!",
-            "translation": "Noch zwei Bestände zu gehen!",
-            "placeholders": [
-                {
-                    "id": "2",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "2"
-                }
-            ]
-        },
-        {
-            "id": "{N} more files remaining!",
-            "message": "{N} more files remaining!",
-            "translation": "Noch {N} Bestände zu gehen!",
-            "placeholders": [
-                {
-                    "id": "N",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "n"
-                }
-            ]
-        },
-        {
-            "id": "Use the following code for your discount: {ReferralCode}",
-            "message": "Use the following code for your discount: {ReferralCode}",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "ReferralCode",
-                    "string": "%[1]d",
-                    "type": "./testdata/test1.referralCode",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "c"
-                }
-            ]
-        },
-        {
-            "id": [
-                "msgOutOfOrder",
-                "{Device} is out of order!"
-            ],
-            "message": "{Device} is out of order!",
-            "translation": "",
-            "comment": "This comment wins.\n",
-            "placeholders": [
-                {
-                    "id": "Device",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "device"
-                }
-            ]
-        },
-        {
-            "id": "{Miles} miles traveled ({Miles_1})",
-            "message": "{Miles} miles traveled ({Miles_1})",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Miles",
-                    "string": "%.2[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                },
-                {
-                    "id": "Miles_1",
-                    "string": "%[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/de/out.gotext.json.want b/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/de/out.gotext.json.want
deleted file mode 100755
index f19e21d72..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/de/out.gotext.json.want
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-    "language": "de",
-    "messages": [
-        {
-            "id": "Hello world!",
-            "message": "Hello world!",
-            "translation": "Hallo Welt!"
-        },
-        {
-            "id": "Hello {City}!",
-            "message": "Hello {City}!",
-            "translation": "Hallo {City}!",
-            "placeholders": [
-                {
-                    "id": "City",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "city"
-                }
-            ]
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "{Person} besucht {Place}!",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "person",
-                    "comment": "The person of matter."
-                },
-                {
-                    "id": "Place",
-                    "string": "%[2]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 2,
-                    "expr": "place",
-                    "comment": "Place the person is visiting."
-                }
-            ]
-        },
-        {
-            "id": "{2} files remaining!",
-            "message": "{2} files remaining!",
-            "translation": "Noch zwei Bestände zu gehen!",
-            "placeholders": [
-                {
-                    "id": "2",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "2"
-                }
-            ]
-        },
-        {
-            "id": "{N} more files remaining!",
-            "message": "{N} more files remaining!",
-            "translation": "Noch {N} Bestände zu gehen!",
-            "placeholders": [
-                {
-                    "id": "N",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "n"
-                }
-            ]
-        },
-        {
-            "id": "Use the following code for your discount: {ReferralCode}",
-            "message": "Use the following code for your discount: {ReferralCode}",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "ReferralCode",
-                    "string": "%[1]d",
-                    "type": "./testdata/test1.referralCode",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "c"
-                }
-            ]
-        },
-        {
-            "id": [
-                "msgOutOfOrder",
-                "{Device} is out of order!"
-            ],
-            "message": "{Device} is out of order!",
-            "translation": "",
-            "comment": "This comment wins.\n",
-            "placeholders": [
-                {
-                    "id": "Device",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "device"
-                }
-            ]
-        },
-        {
-            "id": "{Miles} miles traveled ({Miles_1})",
-            "message": "{Miles} miles traveled ({Miles_1})",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Miles",
-                    "string": "%.2[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                },
-                {
-                    "id": "Miles_1",
-                    "string": "%[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/en-US/messages.gotext.json b/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/en-US/messages.gotext.json
deleted file mode 100755
index b984242f6..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/en-US/messages.gotext.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-    "language": "en-US",
-    "messages": [
-        {
-            "id": "Hello world!",
-            "key": "Hello world!\n",
-            "message": "Hello world!",
-            "translation":  "Hello world!"
-        },
-        {
-            "id": "Hello {City}!",
-            "key": "Hello %s!\n",
-            "message": "Hello {City}!",
-            "translation": "Hello {City}!"
-        },
-        {
-            "id": "Hello {Town}!",
-            "key": "Hello %s!\n",
-            "message": "Hello {Town}!",
-            "translation": "Hello {Town}!",
-            "placeholders": [
-                {
-                    "id": "Town",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "town",
-                    "comment": "Town"
-                }
-            ]
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "key": "%s is visiting %s!\n",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "{Person} is visiting {Place}!"
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "key": "%[1]s is visiting %[3]s!\n",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "{Person} is visiting {Place}!"
-        },
-        {
-            "id": "{2} files remaining!",
-            "key": "%d files remaining!",
-            "message": "{N} files remaining!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "2",
-                    "string": "%[1]d"
-                }
-            ]
-        },
-        {
-            "id": "{N} more files remaining!",
-            "key": "%d more files remaining!",
-            "message": "{N} more files remaining!",
-            "translation": {
-                "select": {
-                    "feature": "plural",
-                    "arg": "N",
-                    "cases": {
-                        "one": "One file remaining!",
-                        "other": "There are {N} more files remaining!"
-                    }
-                }
-            }
-        },
-        {
-            "id": "Use the following code for your discount: {ReferralCode}",
-            "key": "Use the following code for your discount: %d\n",
-            "message": "Use the following code for your discount: {ReferralCode}",
-            "translation": ""
-        },
-        {
-            "id": [ "msgOutOfOrder", "{Device} is out of order!" ],
-            "key": "%s is out of order!",
-            "message": "{Device} is out of order!",
-            "translation": "{Device} is out of order!"
-        },
-        {
-            "id": "{Miles} miles traveled ({Miles_1})",
-            "key": "%.2[1]f miles traveled (%[1]f)",
-            "message": "{Miles} miles traveled ({Miles_1})",
-            "translation": "{Miles} miles traveled ({Miles_1})"
-        }
-    ]
-}
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/en-US/out.gotext.json b/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/en-US/out.gotext.json
deleted file mode 100755
index 59f92a5a6..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/en-US/out.gotext.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-    "language": "en-US",
-    "messages": [
-        {
-            "id": "Hello world!",
-            "message": "Hello world!",
-            "translation": "Hello world!"
-        },
-        {
-            "id": "Hello {City}!",
-            "message": "Hello {City}!",
-            "translation": "Hello {City}!",
-            "placeholders": [
-                {
-                    "id": "City",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "city"
-                }
-            ]
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "{Person} is visiting {Place}!",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "person",
-                    "comment": "The person of matter."
-                },
-                {
-                    "id": "Place",
-                    "string": "%[2]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 2,
-                    "expr": "place",
-                    "comment": "Place the person is visiting."
-                }
-            ]
-        },
-        {
-            "id": "{2} files remaining!",
-            "message": "{2} files remaining!",
-            "translation": "{2} files remaining!",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "2",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "2"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": "{N} more files remaining!",
-            "message": "{N} more files remaining!",
-            "translation": {
-                "select": {
-                    "feature": "plural",
-                    "arg": "N",
-                    "cases": {
-                        "one": {
-                            "msg": "One file remaining!"
-                        },
-                        "other": {
-                            "msg": "There are {N} more files remaining!"
-                        }
-                    }
-                }
-            },
-            "placeholders": [
-                {
-                    "id": "N",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "n"
-                }
-            ]
-        },
-        {
-            "id": "Use the following code for your discount: {ReferralCode}",
-            "message": "Use the following code for your discount: {ReferralCode}",
-            "translation": "Use the following code for your discount: {ReferralCode}",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "ReferralCode",
-                    "string": "%[1]d",
-                    "type": "./testdata/test1.referralCode",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "c"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": [
-                "msgOutOfOrder",
-                "{Device} is out of order!"
-            ],
-            "message": "{Device} is out of order!",
-            "translation": "{Device} is out of order!",
-            "comment": "This comment wins.\n",
-            "placeholders": [
-                {
-                    "id": "Device",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "device"
-                }
-            ]
-        },
-        {
-            "id": "{Miles} miles traveled ({Miles_1})",
-            "message": "{Miles} miles traveled ({Miles_1})",
-            "translation": "{Miles} miles traveled ({Miles_1})",
-            "placeholders": [
-                {
-                    "id": "Miles",
-                    "string": "%.2[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                },
-                {
-                    "id": "Miles_1",
-                    "string": "%[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/en-US/out.gotext.json.want b/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/en-US/out.gotext.json.want
deleted file mode 100755
index 59f92a5a6..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/en-US/out.gotext.json.want
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-    "language": "en-US",
-    "messages": [
-        {
-            "id": "Hello world!",
-            "message": "Hello world!",
-            "translation": "Hello world!"
-        },
-        {
-            "id": "Hello {City}!",
-            "message": "Hello {City}!",
-            "translation": "Hello {City}!",
-            "placeholders": [
-                {
-                    "id": "City",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "city"
-                }
-            ]
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "{Person} is visiting {Place}!",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "person",
-                    "comment": "The person of matter."
-                },
-                {
-                    "id": "Place",
-                    "string": "%[2]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 2,
-                    "expr": "place",
-                    "comment": "Place the person is visiting."
-                }
-            ]
-        },
-        {
-            "id": "{2} files remaining!",
-            "message": "{2} files remaining!",
-            "translation": "{2} files remaining!",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "2",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "2"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": "{N} more files remaining!",
-            "message": "{N} more files remaining!",
-            "translation": {
-                "select": {
-                    "feature": "plural",
-                    "arg": "N",
-                    "cases": {
-                        "one": {
-                            "msg": "One file remaining!"
-                        },
-                        "other": {
-                            "msg": "There are {N} more files remaining!"
-                        }
-                    }
-                }
-            },
-            "placeholders": [
-                {
-                    "id": "N",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "n"
-                }
-            ]
-        },
-        {
-            "id": "Use the following code for your discount: {ReferralCode}",
-            "message": "Use the following code for your discount: {ReferralCode}",
-            "translation": "Use the following code for your discount: {ReferralCode}",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "ReferralCode",
-                    "string": "%[1]d",
-                    "type": "./testdata/test1.referralCode",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "c"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": [
-                "msgOutOfOrder",
-                "{Device} is out of order!"
-            ],
-            "message": "{Device} is out of order!",
-            "translation": "{Device} is out of order!",
-            "comment": "This comment wins.\n",
-            "placeholders": [
-                {
-                    "id": "Device",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "device"
-                }
-            ]
-        },
-        {
-            "id": "{Miles} miles traveled ({Miles_1})",
-            "message": "{Miles} miles traveled ({Miles_1})",
-            "translation": "{Miles} miles traveled ({Miles_1})",
-            "placeholders": [
-                {
-                    "id": "Miles",
-                    "string": "%.2[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                },
-                {
-                    "id": "Miles_1",
-                    "string": "%[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/zh/messages.gotext.json b/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/zh/messages.gotext.json
deleted file mode 100755
index c80d1d2a7..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/zh/messages.gotext.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "language": "zh",
-    "messages": [
-        {
-            "id": "Hello world!",
-            "key": "Hello world!\n",
-            "message": "Hello world!",
-            "translation": ""
-        },
-        {
-            "id": "Hello {City}!",
-            "key": "Hello %s!\n",
-            "message": "Hello {City}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "City",
-                    "string": "%[1]s"
-                }
-            ]
-        },
-        {
-            "id": "Hello {Town}!",
-            "key": "Hello %s!\n",
-            "message": "Hello {Town}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Town",
-                    "string": "%[1]s"
-                }
-            ]
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "key": "%s is visiting %s!\n",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s"
-                },
-                {
-                    "id": "Place",
-                    "string": "%[2]s"
-                }
-            ]
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "key": "%[1]s is visiting %[3]s!\n",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s"
-                },
-                {
-                    "id": "Place",
-                    "string": "%[3]s"
-                },
-                {
-                    "id": "Extra",
-                    "string": "%[2]v"
-                }
-            ]
-        },
-        {
-            "id": "{2} files remaining!",
-            "key": "%d files remaining!",
-            "message": "{2} files remaining!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "",
-                    "string": "%[1]d"
-                }
-            ]
-        },
-        {
-            "id": "{N} more files remaining!",
-            "key": "%d more files remaining!",
-            "message": "{N} more files remaining!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "N",
-                    "string": "%[1]d"
-                }
-            ]
-        },
-        {
-            "id": "Use the following code for your discount: {ReferralCode}",
-            "key": "Use the following code for your discount: %d\n",
-            "message": "Use the following code for your discount: {ReferralCode}",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "ReferralCode",
-                    "string": "%[1]d"
-                }
-            ]
-        },
-        {
-            "id": [ "{Device} is out of order!", "msgOutOfOrder" ],
-            "key": "%s is out of order!",
-            "message": "{Device} is out of order!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Device",
-                    "string": "%[1]s"
-                }
-            ]
-        },
-        {
-            "id": "{Miles} miles traveled ({Miles_1})",
-            "key": "%.2[1]f miles traveled (%[1]f)",
-            "message": "{Miles} miles traveled ({Miles_1})",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Miles",
-                    "string": "%.2[1]f"
-                },
-                {
-                    "id": "Miles_1",
-                    "string": "%[1]f"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/zh/out.gotext.json b/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/zh/out.gotext.json
deleted file mode 100755
index 9bede65ee..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/zh/out.gotext.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-    "language": "zh",
-    "messages": [
-        {
-            "id": "Hello world!",
-            "message": "Hello world!",
-            "translation": ""
-        },
-        {
-            "id": "Hello {City}!",
-            "message": "Hello {City}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "City",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "city"
-                }
-            ]
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "person",
-                    "comment": "The person of matter."
-                },
-                {
-                    "id": "Place",
-                    "string": "%[2]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 2,
-                    "expr": "place",
-                    "comment": "Place the person is visiting."
-                }
-            ]
-        },
-        {
-            "id": "{2} files remaining!",
-            "message": "{2} files remaining!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "2",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "2"
-                }
-            ]
-        },
-        {
-            "id": "{N} more files remaining!",
-            "message": "{N} more files remaining!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "N",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "n"
-                }
-            ]
-        },
-        {
-            "id": "Use the following code for your discount: {ReferralCode}",
-            "message": "Use the following code for your discount: {ReferralCode}",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "ReferralCode",
-                    "string": "%[1]d",
-                    "type": "./testdata/test1.referralCode",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "c"
-                }
-            ]
-        },
-        {
-            "id": [
-                "msgOutOfOrder",
-                "{Device} is out of order!"
-            ],
-            "message": "{Device} is out of order!",
-            "translation": "",
-            "comment": "This comment wins.\n",
-            "placeholders": [
-                {
-                    "id": "Device",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "device"
-                }
-            ]
-        },
-        {
-            "id": "{Miles} miles traveled ({Miles_1})",
-            "message": "{Miles} miles traveled ({Miles_1})",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Miles",
-                    "string": "%.2[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                },
-                {
-                    "id": "Miles_1",
-                    "string": "%[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/zh/out.gotext.json.want b/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/zh/out.gotext.json.want
deleted file mode 100755
index 9bede65ee..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/locales/zh/out.gotext.json.want
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-    "language": "zh",
-    "messages": [
-        {
-            "id": "Hello world!",
-            "message": "Hello world!",
-            "translation": ""
-        },
-        {
-            "id": "Hello {City}!",
-            "message": "Hello {City}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "City",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "city"
-                }
-            ]
-        },
-        {
-            "id": "{Person} is visiting {Place}!",
-            "message": "{Person} is visiting {Place}!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Person",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "person",
-                    "comment": "The person of matter."
-                },
-                {
-                    "id": "Place",
-                    "string": "%[2]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 2,
-                    "expr": "place",
-                    "comment": "Place the person is visiting."
-                }
-            ]
-        },
-        {
-            "id": "{2} files remaining!",
-            "message": "{2} files remaining!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "2",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "2"
-                }
-            ]
-        },
-        {
-            "id": "{N} more files remaining!",
-            "message": "{N} more files remaining!",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "N",
-                    "string": "%[1]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "n"
-                }
-            ]
-        },
-        {
-            "id": "Use the following code for your discount: {ReferralCode}",
-            "message": "Use the following code for your discount: {ReferralCode}",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "ReferralCode",
-                    "string": "%[1]d",
-                    "type": "./testdata/test1.referralCode",
-                    "underlyingType": "int",
-                    "argNum": 1,
-                    "expr": "c"
-                }
-            ]
-        },
-        {
-            "id": [
-                "msgOutOfOrder",
-                "{Device} is out of order!"
-            ],
-            "message": "{Device} is out of order!",
-            "translation": "",
-            "comment": "This comment wins.\n",
-            "placeholders": [
-                {
-                    "id": "Device",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "device"
-                }
-            ]
-        },
-        {
-            "id": "{Miles} miles traveled ({Miles_1})",
-            "message": "{Miles} miles traveled ({Miles_1})",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Miles",
-                    "string": "%.2[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                },
-                {
-                    "id": "Miles_1",
-                    "string": "%[1]f",
-                    "type": "float64",
-                    "underlyingType": "float64",
-                    "argNum": 1,
-                    "expr": "miles"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vendor/golang.org/x/text/message/pipeline/testdata/test1/test1.go b/vendor/golang.org/x/text/message/pipeline/testdata/test1/test1.go
deleted file mode 100644
index 88051f932..000000000
--- a/vendor/golang.org/x/text/message/pipeline/testdata/test1/test1.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import "golang.org/x/text/message"
-
-func main() {
-	p := message.NewPrinter(message.MatchLanguage("en"))
-
-	// NOT EXTRACTED: strings passed to Println are not extracted.
-	p.Println("Hello world!")
-
-	// NOT EXTRACTED: strings passed to Print are not extracted.
-	p.Print("Hello world!\n")
-
-	// Extract and trim whitespace (TODO).
-	p.Printf("Hello world!\n")
-
-	// NOT EXTRACTED: city is not used as a pattern or passed to %m.
-	city := "Amsterdam"
-	// This comment is extracted.
-	p.Printf("Hello %s!\n", city)
-
-	person := "Sheila"
-	place := "Zürich"
-
-	// Substitutions replaced by variable names.
-	p.Printf("%s is visiting %s!\n",
-		person, // The person of matter.
-		place,  // Place the person is visiting.
-	)
-
-	pp := struct {
-		Person string // The person of matter. // TODO: get this comment.
-		Place  string
-		extra  int
-	}{
-		person, place, 4,
-	}
-
-	// extract will drop this comment in favor of the one below.
-	p.Printf("%[1]s is visiting %[3]s!\n", // Field names are placeholders.
-		pp.Person,
-		pp.extra,
-		pp.Place, // Place the person is visiting.
-	)
-
-	// Numeric literal becomes placeholder.
-	p.Printf("%d files remaining!", 2)
-
-	const n = 2
-
-	// Constant identifier becomes placeholder.
-	p.Printf("%d more files remaining!", n)
-
-	// Infer better names from type names.
-	type referralCode int
-
-	const c = referralCode(5)
-
-	// Use type name as placeholder.
-	p.Printf("Use the following code for your discount: %d\n", c)
-
-	// Use constant name as message ID.
-	const msgOutOfOrder = "%s is out of order!" // This comment wins.
-	const device = "Soda machine"
-	// This message has two IDs.
-	p.Printf(msgOutOfOrder, device)
-
-	// Multiple substitutions for same argument.
-	miles := 1.2345
-	p.Printf("%.2[1]f miles traveled (%[1]f)", miles)
-}