all repos — searchix @ 3dfbd8dd7212f74622ba4892efb34bf3487da09b

Search engine for NixOS, nix-darwin, home-manager and NUR users

feat: switch from errors to fault

Alan Pearce
commit

3dfbd8dd7212f74622ba4892efb34bf3487da09b

parent

e72b060271452e25bbcb2799fc19996ff73689fd

1 file changed, 10 insertions(+), 9 deletions(-)

changed files
M internal/config/repository.gointernal/config/repository.go
@@ -5,7 +5,8 @@ "fmt"
"net/url" "strings" - "gitlab.com/tozd/go/errors" + "github.com/Southclaws/fault" + "github.com/Southclaws/fault/fmsg" ) type RepoType int
@@ -22,7 +23,7 @@ Repo string
Revision string `toml:"-"` } -func (r *Repository) GetRawFileURL(path string) (string, errors.E) { +func (r *Repository) GetRawFileURL(path string) (string, error) { switch r.Type { case GitHub: ref := r.Revision
@@ -31,19 +32,19 @@ ref = "master"
} u, err := url.JoinPath("https://github.com/", r.Owner, r.Repo, "raw", ref, path) if err != nil { - return "", errors.Wrap(err, "failed to join path") + return "", fault.Wrap(err, fmsg.With("failed to join path")) } return u, nil default: - return "", errors.Errorf( + return "", fault.Newf( "don't know how to generate a repository URL for %s", r.Type.String(), ) } } -func (r *Repository) GetFileURL(path string, line ...string) (string, errors.E) { +func (r *Repository) GetFileURL(path string, line ...string) (string, error) { switch r.Type { case GitHub: ref := r.Revision
@@ -52,7 +53,7 @@ ref = "master"
} u, err := url.JoinPath("https://github.com/", r.Owner, r.Repo, "blob", ref, path) if err != nil { - return "", errors.Wrap(err, "failed to join path") + return "", fault.Wrap(err, fmsg.With("failed to join path")) } if len(line) > 0 { u += fmt.Sprintf("#L%s", line[0])
@@ -60,7 +61,7 @@ }
return u, nil default: - return "", errors.Errorf( + return "", fault.Newf( "don't know how to generate a repository URL for %s", r.Type.String(), )
@@ -90,12 +91,12 @@ return fmt.Sprintf("RepoType(%d)", f)
} } -func parseRepoType(name string) (RepoType, errors.E) { +func parseRepoType(name string) (RepoType, error) { switch strings.ToLower(name) { case "github": return GitHub, nil default: - return UnknownRepoType, errors.Errorf("unsupported repo type %s", name) + return UnknownRepoType, fault.Newf("unsupported repo type %s", name) } }