summaryrefslogtreecommitdiffstats
path: root/common/herrors/line_number_extractors.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2021-07-27 19:07:10 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2021-07-28 11:51:13 +0200
commita3701e09313695d4a0f6fb0eb7844c1a4befc07a (patch)
tree443c85a8b6cbf841155efad4aa99ead8c2824720 /common/herrors/line_number_extractors.go
parent40b6016cf3f7aac541b042d32e3a162411fd9cd0 (diff)
Switch to go-toml v2
We have been using `go-toml` for language files only. This commit makes it the only TOML library. It's spec compliant and very fast. A benchark building a site with 200 pages with TOML front matter: ```bash name old time/op new time/op delta SiteNew/Regular_TOML_front_matter-16 48.5ms ± 1% 47.1ms ± 1% -2.85% (p=0.029 n=4+4) name old alloc/op new alloc/op delta SiteNew/Regular_TOML_front_matter-16 16.9MB ± 0% 16.7MB ± 0% -1.56% (p=0.029 n=4+4) name old allocs/op new allocs/op delta SiteNew/Regular_TOML_front_matter-16 302k ± 0% 296k ± 0% -2.20% (p=0.029 n=4+4) ``` Note that the front matter unmarshaling is only a small part of building a site, so the above is very good. Fixes #8801
Diffstat (limited to 'common/herrors/line_number_extractors.go')
-rw-r--r--common/herrors/line_number_extractors.go15
1 files changed, 13 insertions, 2 deletions
diff --git a/common/herrors/line_number_extractors.go b/common/herrors/line_number_extractors.go
index 13e94614d..3df62bdfe 100644
--- a/common/herrors/line_number_extractors.go
+++ b/common/herrors/line_number_extractors.go
@@ -16,6 +16,10 @@ package herrors
import (
"regexp"
"strconv"
+
+ "github.com/pkg/errors"
+
+ "github.com/pelletier/go-toml/v2"
)
var lineNumberExtractors = []lineNumberExtractor{
@@ -24,8 +28,7 @@ var lineNumberExtractors = []lineNumberExtractor{
newLineNumberErrHandlerFromRegexp(".*:(\\d+):"),
// TOML parse errors
- newLineNumberErrHandlerFromRegexp(".*Near line (\\d+)(\\s.*)"),
-
+ tomlLineNumberExtractor,
// YAML parse errors
newLineNumberErrHandlerFromRegexp("line (\\d+):"),
@@ -35,6 +38,14 @@ var lineNumberExtractors = []lineNumberExtractor{
type lineNumberExtractor func(e error) (int, int)
+var tomlLineNumberExtractor = func(e error) (int, int) {
+ e = errors.Cause(e)
+ if terr, ok := e.(*toml.DecodeError); ok {
+ return terr.Position()
+ }
+ return -1, -1
+}
+
func newLineNumberErrHandlerFromRegexp(expression string) lineNumberExtractor {
re := regexp.MustCompile(expression)
return extractLineNo(re)