aboutsummaryrefslogtreecommitdiffhomepage
path: root/parser/frontmatter.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <[email protected]>2017-05-31 13:10:46 +0300
committerBjørn Erik Pedersen <[email protected]>2017-06-03 09:22:57 +0200
commit0907a5c1c293755e6bf297246f07888448d81f8b (patch)
treebeb4af6ccb9907ec2d7ccfdd53d04b92f07e095d /parser/frontmatter.go
parent3d9c4f513b0443648d7e88995e351df1739646d2 (diff)
downloadhugo-0907a5c1c293755e6bf297246f07888448d81f8b.tar.gz
hugo-0907a5c1c293755e6bf297246f07888448d81f8b.zip
all: Temporarily revert to BurntSushi for TOML front matter handling
We still have go-toml as a transitive dependency, and it is the way to go eventually, but we care about speed, so let us wait that one out. Note that the issue this fixes is about taxonomies, but I guess this is a general issue for sites with many pages that uses TOML as front matter. ``` benchmark old ns/op new ns/op delta BenchmarkFrontmatterTags/TOML:1-4 23206 8543 -63.19% BenchmarkFrontmatterTags/TOML:11-4 80117 18495 -76.92% BenchmarkFrontmatterTags/TOML:21-4 140676 28727 -79.58% benchmark old allocs new allocs delta BenchmarkFrontmatterTags/TOML:1-4 173 60 -65.32% BenchmarkFrontmatterTags/TOML:11-4 625 138 -77.92% BenchmarkFrontmatterTags/TOML:21-4 1106 210 -81.01% benchmark old bytes new bytes delta BenchmarkFrontmatterTags/TOML:1-4 9231 2912 -68.45% BenchmarkFrontmatterTags/TOML:11-4 19808 5184 -73.83% BenchmarkFrontmatterTags/TOML:21-4 31200 7536 -75.85% ``` See #3541 Updates #3464
Diffstat (limited to 'parser/frontmatter.go')
-rw-r--r--parser/frontmatter.go18
1 files changed, 4 insertions, 14 deletions
diff --git a/parser/frontmatter.go b/parser/frontmatter.go
index b773fe5ce..627d5ef49 100644
--- a/parser/frontmatter.go
+++ b/parser/frontmatter.go
@@ -20,8 +20,8 @@ import (
"io"
"strings"
+ "github.com/BurntSushi/toml"
"github.com/chaseadamsio/goorgeous"
- toml "github.com/pelletier/go-toml"
"gopkg.in/yaml.v2"
)
@@ -52,13 +52,7 @@ func InterfaceToConfig(in interface{}, mark rune, w io.Writer) error {
return err
case rune(TOMLLead[0]):
- tree, err := toml.TreeFromMap(in.(map[string]interface{}))
- if err != nil {
- return err
- }
-
- _, err = tree.WriteTo(w)
- return err
+ return toml.NewEncoder(w).Encode(in)
case rune(JSONLead[0]):
b, err := json.MarshalIndent(in, "", " ")
if err != nil {
@@ -176,14 +170,10 @@ func HandleTOMLMetaData(datum []byte) (interface{}, error) {
m := map[string]interface{}{}
datum = removeTOMLIdentifier(datum)
- tree, err := toml.LoadReader(bytes.NewReader(datum))
- if err != nil {
- return m, err
- }
+ _, err := toml.Decode(string(datum), &m)
- m = tree.ToMap()
+ return m, err
- return m, nil
}
// removeTOMLIdentifier removes, if necessary, beginning and ending TOML