From 7749962c24172c29fd8851afb86e923b5d5f369c Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 29 Jun 2024 19:11:56 +0200
Subject: change error package

---
 cmd/build/main.go               | 2 +-
 cmd/server/main.go              | 2 +-
 go.mod                          | 3 ++-
 go.sum                          | 5 +++++
 internal/builder/builder.go     | 2 +-
 internal/builder/template.go    | 2 +-
 internal/config/config.go       | 2 +-
 internal/config/cspgenerator.go | 2 +-
 internal/content/posts.go       | 2 +-
 internal/listenfd/listenfd.go   | 2 +-
 internal/server/dev.go          | 2 +-
 internal/server/server.go       | 2 +-
 internal/server/tls.go          | 2 +-
 internal/vcs/repository.go      | 2 +-
 internal/website/filemap.go     | 2 +-
 internal/website/mux.go         | 2 +-
 16 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/cmd/build/main.go b/cmd/build/main.go
index e79cd14..14175e9 100644
--- a/cmd/build/main.go
+++ b/cmd/build/main.go
@@ -8,7 +8,7 @@ import (
 	"go.alanpearce.eu/website/internal/log"
 
 	"github.com/ardanlabs/conf/v3"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 func main() {
diff --git a/cmd/server/main.go b/cmd/server/main.go
index c332457..576cfb3 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -10,7 +10,7 @@ import (
 	"go.alanpearce.eu/website/internal/server"
 
 	"github.com/ardanlabs/conf/v3"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
index 0639a1d..3aa7fcf 100644
--- a/go.mod
+++ b/go.mod
@@ -22,12 +22,12 @@ require (
 	github.com/kevinpollet/nego v0.0.0-20211010160919-a65cd48cee43
 	github.com/osdevisnot/sorvor v0.4.4
 	github.com/pberkel/caddy-storage-redis v1.2.0
-	github.com/pkg/errors v0.9.1
 	github.com/snabb/sitemap v1.0.4
 	github.com/stefanfritsch/goldmark-fences v1.0.0
 	github.com/sykesm/zap-logfmt v0.0.4
 	github.com/thessem/zap-prettyconsole v0.5.0
 	github.com/yuin/goldmark v1.7.4
+	gitlab.com/tozd/go/errors v0.8.1
 	go.uber.org/zap v1.27.0
 )
 
@@ -70,6 +70,7 @@ require (
 	github.com/miekg/dns v1.1.61 // indirect
 	github.com/onsi/ginkgo/v2 v2.19.0 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.19.1 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.54.0 // indirect
diff --git a/go.sum b/go.sum
index 9c285cb..52b992b 100644
--- a/go.sum
+++ b/go.sum
@@ -107,6 +107,7 @@ github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncV
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20240625030939-27f56978b8b0 h1:e+8XbKB6IMn8A4OAyZccO4pYfB3s7bt6azNIPE7AnPg=
@@ -198,6 +199,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/sykesm/zap-logfmt v0.0.4 h1:U2WzRvmIWG1wDLCFY3sz8UeEmsdHQjHFNlIdmroVFaI=
@@ -215,6 +217,8 @@ github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg=
 github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ=
 github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
 github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
+gitlab.com/tozd/go/errors v0.8.1 h1:RfylffRAsl3PbDdHNUBEkTleTCiL/RIT+Ef8p0HRNCI=
+gitlab.com/tozd/go/errors v0.8.1/go.mod h1:PvIdUMLpPwxr+KEBxghQaCMydHXGYdJQn/PhdMqYREY=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
 go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
@@ -331,6 +335,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
diff --git a/internal/builder/builder.go b/internal/builder/builder.go
index f190b6a..0d4b1fc 100644
--- a/internal/builder/builder.go
+++ b/internal/builder/builder.go
@@ -18,7 +18,7 @@ import (
 
 	"github.com/a-h/templ"
 	mapset "github.com/deckarep/golang-set/v2"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 type IOConfig struct {
diff --git a/internal/builder/template.go b/internal/builder/template.go
index 91a40c4..b50861b 100644
--- a/internal/builder/template.go
+++ b/internal/builder/template.go
@@ -15,7 +15,7 @@ import (
 	"github.com/PuerkitoBio/goquery"
 	"github.com/antchfx/xmlquery"
 	"github.com/antchfx/xpath"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 var (
diff --git a/internal/config/config.go b/internal/config/config.go
index deb70e6..5e568cd 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -8,7 +8,7 @@ import (
 	"go.alanpearce.eu/website/internal/log"
 
 	"github.com/BurntSushi/toml"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 type Taxonomy struct {
diff --git a/internal/config/cspgenerator.go b/internal/config/cspgenerator.go
index 40eca01..9974819 100644
--- a/internal/config/cspgenerator.go
+++ b/internal/config/cspgenerator.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/crewjam/csp"
 	"github.com/fatih/structtag"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 func GenerateCSP() error {
diff --git a/internal/content/posts.go b/internal/content/posts.go
index d56688d..000cd98 100644
--- a/internal/content/posts.go
+++ b/internal/content/posts.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/adrg/frontmatter"
 	mapset "github.com/deckarep/golang-set/v2"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 	fences "github.com/stefanfritsch/goldmark-fences"
 	"github.com/yuin/goldmark"
 	"github.com/yuin/goldmark/extension"
diff --git a/internal/listenfd/listenfd.go b/internal/listenfd/listenfd.go
index a45637e..4e8c007 100644
--- a/internal/listenfd/listenfd.go
+++ b/internal/listenfd/listenfd.go
@@ -8,7 +8,7 @@ import (
 
 	"go.alanpearce.eu/website/internal/log"
 
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 const fdStart = 3
diff --git a/internal/server/dev.go b/internal/server/dev.go
index b984704..e83201a 100644
--- a/internal/server/dev.go
+++ b/internal/server/dev.go
@@ -13,7 +13,7 @@ import (
 	"go.alanpearce.eu/website/internal/log"
 
 	"github.com/fsnotify/fsnotify"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 type FileWatcher struct {
diff --git a/internal/server/server.go b/internal/server/server.go
index c17c8d6..6f933ef 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/ardanlabs/conf/v3"
 	"github.com/osdevisnot/sorvor/pkg/livereload"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 var (
diff --git a/internal/server/tls.go b/internal/server/tls.go
index d48b5df..7bd4a1c 100644
--- a/internal/server/tls.go
+++ b/internal/server/tls.go
@@ -14,7 +14,7 @@ import (
 	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/certmagic"
 	certmagic_redis "github.com/pberkel/caddy-storage-redis"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 type redisConfig struct {
diff --git a/internal/vcs/repository.go b/internal/vcs/repository.go
index db212e9..42dc6f7 100644
--- a/internal/vcs/repository.go
+++ b/internal/vcs/repository.go
@@ -7,7 +7,7 @@ import (
 	"go.alanpearce.eu/website/internal/log"
 
 	"github.com/go-git/go-git/v5"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 type Config struct {
diff --git a/internal/website/filemap.go b/internal/website/filemap.go
index 8e16d7e..21cd28a 100644
--- a/internal/website/filemap.go
+++ b/internal/website/filemap.go
@@ -12,7 +12,7 @@ import (
 
 	"go.alanpearce.eu/website/internal/log"
 
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 type File struct {
diff --git a/internal/website/mux.go b/internal/website/mux.go
index 0c2a47d..c6992df 100644
--- a/internal/website/mux.go
+++ b/internal/website/mux.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/benpate/digit"
 	"github.com/kevinpollet/nego"
-	"github.com/pkg/errors"
+	"gitlab.com/tozd/go/errors"
 )
 
 func CanonicalisePath(path string) (cPath string, differs bool) {
-- 
cgit 1.4.1