summaryrefslogtreecommitdiffstats
path: root/output
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 /output
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 'output')
-rw-r--r--output/outputFormat.go6
1 files changed, 2 insertions, 4 deletions
diff --git a/output/outputFormat.go b/output/outputFormat.go
index 34bec9911..1f1556eaf 100644
--- a/output/outputFormat.go
+++ b/output/outputFormat.go
@@ -20,8 +20,6 @@ import (
"sort"
"strings"
- "github.com/pkg/errors"
-
"github.com/mitchellh/mapstructure"
"github.com/gohugoio/hugo/media"
@@ -364,7 +362,7 @@ func decode(mediaTypes media.Types, input any, output *Format) error {
}
dataVal.SetMapIndex(key, reflect.ValueOf(mediaType))
default:
- return nil, errors.Errorf("invalid output format configuration; wrong type for media type, expected string (e.g. text/html), got %T", vvi)
+ return nil, fmt.Errorf("invalid output format configuration; wrong type for media type, expected string (e.g. text/html), got %T", vvi)
}
}
}
@@ -379,7 +377,7 @@ func decode(mediaTypes media.Types, input any, output *Format) error {
}
if err = decoder.Decode(input); err != nil {
- return errors.Wrap(err, "failed to decode output format configuration")
+ return fmt.Errorf("failed to decode output format configuration: %w", err)
}
return nil