Update vendored dependencies

vendor/gopkg.in/gcfg.v1/read.go

@@ -6,11 +6,10 @@ import (
 	"io/ioutil"
 	"os"
 	"strings"
-)
 
-import (
 	"gopkg.in/gcfg.v1/scanner"
 	"gopkg.in/gcfg.v1/token"
+	"gopkg.in/warnings.v0"
 )
 
 var unescape = map[rune]rune{'\\': '\\', '"': '"', 'n': '\n', 't': '\t'}
@@ -49,7 +48,9 @@ func unquote(s string) string {
 	return string(u)
 }
 
-func readInto(config interface{}, fset *token.FileSet, file *token.File, src []byte) error {
+func readIntoPass(c *warnings.Collector, config interface{}, fset *token.FileSet,
+	file *token.File, src []byte, subsectPass bool) error {
+	//
 	var s scanner.Scanner
 	var errs scanner.ErrorList
 	s.Init(file, src, func(p token.Position, m string) { errs.Add(p, m) }, 0)
@@ -60,7 +61,9 @@ func readInto(config interface{}, fset *token.FileSet, file *token.File, src []b
 	}
 	for {
 		if errs.Len() > 0 {
-			return errs.Err()
+			if err := c.Collect(errs.Err()); err != nil {
+				return err
+			}
 		}
 		switch tok {
 		case token.EOF:
@@ -70,46 +73,64 @@ func readInto(config interface{}, fset *token.FileSet, file *token.File, src []b
 		case token.LBRACK:
 			pos, tok, lit = s.Scan()
 			if errs.Len() > 0 {
-				return errs.Err()
+				if err := c.Collect(errs.Err()); err != nil {
+					return err
+				}
 			}
 			if tok != token.IDENT {
-				return errfn("expected section name")
+				if err := c.Collect(errfn("expected section name")); err != nil {
+					return err
+				}
 			}
 			sect, sectsub = lit, ""
 			pos, tok, lit = s.Scan()
 			if errs.Len() > 0 {
-				return errs.Err()
+				if err := c.Collect(errs.Err()); err != nil {
+					return err
+				}
 			}
 			if tok == token.STRING {
 				sectsub = unquote(lit)
 				if sectsub == "" {
-					return errfn("empty subsection name")
+					if err := c.Collect(errfn("empty subsection name")); err != nil {
+						return err
+					}
 				}
 				pos, tok, lit = s.Scan()
 				if errs.Len() > 0 {
-					return errs.Err()
+					if err := c.Collect(errs.Err()); err != nil {
+						return err
+					}
 				}
 			}
 			if tok != token.RBRACK {
 				if sectsub == "" {
-					return errfn("expected subsection name or right bracket")
+					if err := c.Collect(errfn("expected subsection name or right bracket")); err != nil {
+						return err
+					}
+				}
+				if err := c.Collect(errfn("expected right bracket")); err != nil {
+					return err
 				}
-				return errfn("expected right bracket")
 			}
 			pos, tok, lit = s.Scan()
 			if tok != token.EOL && tok != token.EOF && tok != token.COMMENT {
-				return errfn("expected EOL, EOF, or comment")
+				if err := c.Collect(errfn("expected EOL, EOF, or comment")); err != nil {
+					return err
+				}
 			}
 			// If a section/subsection header was found, ensure a
 			// container object is created, even if there are no
 			// variables further down.
-			err := set(config, sect, sectsub, "", true, "")
+			err := c.Collect(set(c, config, sect, sectsub, "", true, "", subsectPass))
 			if err != nil {
 				return err
 			}
 		case token.IDENT:
 			if sect == "" {
-				return errfn("expected section header")
+				if err := c.Collect(errfn("expected section header")); err != nil {
+					return err
+				}
 			}
 			n := lit
 			pos, tok, lit = s.Scan()
@@ -119,38 +140,67 @@ func readInto(config interface{}, fset *token.FileSet, file *token.File, src []b
 			blank, v := tok == token.EOF || tok == token.EOL || tok == token.COMMENT, ""
 			if !blank {
 				if tok != token.ASSIGN {
-					return errfn("expected '='")
+					if err := c.Collect(errfn("expected '='")); err != nil {
+						return err
+					}
 				}
 				pos, tok, lit = s.Scan()
 				if errs.Len() > 0 {
-					return errs.Err()
+					if err := c.Collect(errs.Err()); err != nil {
+						return err
+					}
 				}
 				if tok != token.STRING {
-					return errfn("expected value")
+					if err := c.Collect(errfn("expected value")); err != nil {
+						return err
+					}
 				}
 				v = unquote(lit)
 				pos, tok, lit = s.Scan()
 				if errs.Len() > 0 {
-					return errs.Err()
+					if err := c.Collect(errs.Err()); err != nil {
+						return err
+					}
 				}
 				if tok != token.EOL && tok != token.EOF && tok != token.COMMENT {
-					return errfn("expected EOL, EOF, or comment")
+					if err := c.Collect(errfn("expected EOL, EOF, or comment")); err != nil {
+						return err
+					}
 				}
 			}
-			err := set(config, sect, sectsub, n, blank, v)
+			err := set(c, config, sect, sectsub, n, blank, v, subsectPass)
 			if err != nil {
 				return err
 			}
 		default:
 			if sect == "" {
-				return errfn("expected section header")
+				if err := c.Collect(errfn("expected section header")); err != nil {
+					return err
+				}
+			}
+			if err := c.Collect(errfn("expected section header or variable declaration")); err != nil {
+				return err
 			}
-			return errfn("expected section header or variable declaration")
 		}
 	}
 	panic("never reached")
 }
 
+func readInto(config interface{}, fset *token.FileSet, file *token.File,
+	src []byte) error {
+	//
+	c := warnings.NewCollector(isFatal)
+	err := readIntoPass(c, config, fset, file, src, false)
+	if err != nil {
+		return err
+	}
+	err = readIntoPass(c, config, fset, file, src, true)
+	if err != nil {
+		return err
+	}
+	return c.Done()
+}
+
 // ReadInto reads gcfg formatted data from reader and sets the values into the
 // corresponding fields in config.
 func ReadInto(config interface{}, reader io.Reader) error {