summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/pelletier
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-09-29 12:46:30 -0700
committerGitHub <noreply@github.com>2017-09-29 12:46:30 -0700
commitb84736e9b6401df0c6eeab9950bef09458a6aefd (patch)
treed9175208de3236db75a33879750a57b3000ba096 /vendor/github.com/pelletier
parent8b9dbb86133ff0fd6002a391268383d1593918ca (diff)
downloadchat-b84736e9b6401df0c6eeab9950bef09458a6aefd.tar.gz
chat-b84736e9b6401df0c6eeab9950bef09458a6aefd.tar.bz2
chat-b84736e9b6401df0c6eeab9950bef09458a6aefd.zip
Updating server dependancies. (#7538)
Diffstat (limited to 'vendor/github.com/pelletier')
-rw-r--r--vendor/github.com/pelletier/go-toml/.travis.yml2
-rw-r--r--vendor/github.com/pelletier/go-toml/README.md9
-rw-r--r--vendor/github.com/pelletier/go-toml/query/parser.go2
3 files changed, 7 insertions, 6 deletions
diff --git a/vendor/github.com/pelletier/go-toml/.travis.yml b/vendor/github.com/pelletier/go-toml/.travis.yml
index 1f8b41ffe..496691166 100644
--- a/vendor/github.com/pelletier/go-toml/.travis.yml
+++ b/vendor/github.com/pelletier/go-toml/.travis.yml
@@ -1,9 +1,9 @@
sudo: false
language: go
go:
- - 1.6.4
- 1.7.6
- 1.8.3
+ - 1.9
- tip
matrix:
allow_failures:
diff --git a/vendor/github.com/pelletier/go-toml/README.md b/vendor/github.com/pelletier/go-toml/README.md
index 22da41a81..2681690d5 100644
--- a/vendor/github.com/pelletier/go-toml/README.md
+++ b/vendor/github.com/pelletier/go-toml/README.md
@@ -33,7 +33,7 @@ import "github.com/pelletier/go-toml"
Read a TOML document:
```go
-config, _ := toml.LoadString(`
+config, _ := toml.Load(`
[postgres]
user = "pelletier"
password = "mypassword"`)
@@ -42,7 +42,7 @@ user := config.Get("postgres.user").(string)
// or using an intermediate object
postgresConfig := config.Get("postgres").(*toml.Tree)
-password = postgresConfig.Get("password").(string)
+password := postgresConfig.Get("password").(string)
```
Or use Unmarshal:
@@ -62,7 +62,7 @@ user = "pelletier"
password = "mypassword"`)
config := Config{}
-Unmarshal(doc, &config)
+toml.Unmarshal(doc, &config)
fmt.Println("user=", config.Postgres.User)
```
@@ -70,7 +70,8 @@ Or use a query:
```go
// use a query to gather elements without walking the tree
-results, _ := config.Query("$..[user,password]")
+q, _ := query.Compile("$..[user,password]")
+results := q.Execute(config)
for ii, item := range results.Values() {
fmt.Println("Query result %d: %v", ii, item)
}
diff --git a/vendor/github.com/pelletier/go-toml/query/parser.go b/vendor/github.com/pelletier/go-toml/query/parser.go
index e4f91b97e..5f69b70d4 100644
--- a/vendor/github.com/pelletier/go-toml/query/parser.go
+++ b/vendor/github.com/pelletier/go-toml/query/parser.go
@@ -253,7 +253,7 @@ func (p *queryParser) parseFilterExpr() queryParserStateFn {
}
tok = p.getToken()
if tok.typ != tokenKey && tok.typ != tokenString {
- return p.parseError(tok, "expected key or string for filter funciton name")
+ return p.parseError(tok, "expected key or string for filter function name")
}
name := tok.val
tok = p.getToken()