diff options
| author | Bjørn Erik Pedersen <[email protected]> | 2021-06-09 10:58:18 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2021-06-14 17:00:32 +0200 |
| commit | d392893cd73dc00c927f342778f6dca9628d328e (patch) | |
| tree | e2ea3eec09f36b7122ecdbc498c3c130e240e85c /markup/markup_config | |
| parent | a886dd53b80322e1edf924f2ede4d4ea037c5baf (diff) | |
| download | hugo-d392893cd73dc00c927f342778f6dca9628d328e.tar.gz hugo-d392893cd73dc00c927f342778f6dca9628d328e.zip | |
Misc config loading fixes
The main motivation behind this is simplicity and correctnes, but the new small config library is also faster:
```
BenchmarkDefaultConfigProvider/Viper-16 252418 4546 ns/op 2720 B/op 30 allocs/op
BenchmarkDefaultConfigProvider/Custom-16 450756 2651 ns/op 1008 B/op 6 allocs/op
```
Fixes #8633
Fixes #8618
Fixes #8630
Updates #8591
Closes #6680
Closes #5192
Diffstat (limited to 'markup/markup_config')
| -rw-r--r-- | markup/markup_config/config.go | 3 | ||||
| -rw-r--r-- | markup/markup_config/config_test.go | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/markup/markup_config/config.go b/markup/markup_config/config.go index a3562cd24..d4a101709 100644 --- a/markup/markup_config/config.go +++ b/markup/markup_config/config.go @@ -24,7 +24,6 @@ import ( "github.com/gohugoio/hugo/markup/tableofcontents" "github.com/gohugoio/hugo/parser" "github.com/mitchellh/mapstructure" - "github.com/spf13/cast" ) type Config struct { @@ -73,7 +72,7 @@ func normalizeConfig(m map[string]interface{}) { if err != nil { return } - vm := cast.ToStringMap(v) + vm := maps.ToStringMap(v) // Changed from a bool in 0.81.0 if vv, found := vm["attribute"]; found { if vvb, ok := vv.(bool); ok { diff --git a/markup/markup_config/config_test.go b/markup/markup_config/config_test.go index 4a1f1232b..08d7b5995 100644 --- a/markup/markup_config/config_test.go +++ b/markup/markup_config/config_test.go @@ -16,7 +16,7 @@ package markup_config import ( "testing" - "github.com/spf13/viper" + "github.com/gohugoio/hugo/config" qt "github.com/frankban/quicktest" ) @@ -26,7 +26,7 @@ func TestConfig(t *testing.T) { c.Run("Decode", func(c *qt.C) { c.Parallel() - v := viper.New() + v := config.New() v.Set("markup", map[string]interface{}{ "goldmark": map[string]interface{}{ @@ -55,7 +55,7 @@ func TestConfig(t *testing.T) { c.Run("legacy", func(c *qt.C) { c.Parallel() - v := viper.New() + v := config.New() v.Set("blackfriday", map[string]interface{}{ "angledQuotes": true, |