summaryrefslogtreecommitdiffstats
path: root/markup
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-05-02 16:07:52 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-05-06 19:43:22 +0200
commitf2946da9e806c2bafbdd26707fe339db79bd980b (patch)
treeb5609317a861ea5f399e094e1b9287ca71dc22d1 /markup
parent6eea32bd6bc8e7a7dd07a8cb6a8343ae2c74aba0 (diff)
Improve error messages, esp. when the server is running
* Add file context to minifier errors when publishing * Misc fixes (see issues) * Allow custom server error template in layouts/server/error.html To get to this, this commit also cleans up and simplifies the code surrounding errors and files. This also removes the usage of `github.com/pkg/errors`, mostly because of https://github.com/pkg/errors/issues/223 -- but also because most of this is now built-in to Go. Fixes #9852 Fixes #9857 Fixes #9863
Diffstat (limited to 'markup')
-rw-r--r--markup/blackfriday/blackfriday_config/config.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/markup/blackfriday/blackfriday_config/config.go b/markup/blackfriday/blackfriday_config/config.go
index 668478ece..8c276c9f6 100644
--- a/markup/blackfriday/blackfriday_config/config.go
+++ b/markup/blackfriday/blackfriday_config/config.go
@@ -19,8 +19,9 @@
package blackfriday_config
import (
+ "fmt"
+
"github.com/mitchellh/mapstructure"
- "github.com/pkg/errors"
)
// Default holds the default BlackFriday config.
@@ -64,7 +65,7 @@ type Config struct {
func UpdateConfig(b Config, m map[string]any) (Config, error) {
if err := mapstructure.Decode(m, &b); err != nil {
- return b, errors.WithMessage(err, "failed to decode rendering config")
+ return b, fmt.Errorf("failed to decode rendering config: %w", err)
}
return b, nil
}