github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

errors: Return error from cast.ToStringE() consistently

Browse source
This commit is contained in:
seiya 2024-04-03 09:12:13 +09:00 committed by Bjørn Erik Pedersen
parent 2da4ec5738
commit 6f07e5976d
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tpl/lang/lang.go
View file

@ -58,7 +58,7 @@ func (ns *Namespace) Translate(ctx context.Context, id any, args ...any) (string
sid, err := cast.ToStringE(id) sid, err := cast.ToStringE(id)
if err != nil { if err != nil {
return "", nil return "", err
} }
return ns.deps.Translate(ctx, sid, templateData), nil return ns.deps.Translate(ctx, sid, templateData), nil
@ -165,7 +165,7 @@ func (ns *Namespace) FormatNumberCustom(precision, number any, options ...any) (
// custom delimiter // custom delimiter
s, err := cast.ToStringE(options[1]) s, err := cast.ToStringE(options[1])
if err != nil { if err != nil {
return "", nil return "", err
} }
delim = s delim = s
@ -173,7 +173,7 @@ func (ns *Namespace) FormatNumberCustom(precision, number any, options ...any) (
s, err := cast.ToStringE(options[0]) s, err := cast.ToStringE(options[0])
if err != nil { if err != nil {
return "", nil return "", err
} }
rs := strings.Split(s, delim) rs := strings.Split(s, delim)

8
tpl/urls/urls.go
View file

@ -42,7 +42,7 @@ type Namespace struct {
func (ns *Namespace) AbsURL(s any) (string, error) { func (ns *Namespace) AbsURL(s any) (string, error) {
ss, err := cast.ToStringE(s) ss, err := cast.ToStringE(s)
if err != nil { if err != nil {
return "", nil return "", err
} }
return ns.deps.PathSpec.AbsURL(ss, false), nil return ns.deps.PathSpec.AbsURL(ss, false), nil
@ -64,7 +64,7 @@ func (ns *Namespace) Parse(rawurl any) (*url.URL, error) {
func (ns *Namespace) RelURL(s any) (string, error) { func (ns *Namespace) RelURL(s any) (string, error) {
ss, err := cast.ToStringE(s) ss, err := cast.ToStringE(s)
if err != nil { if err != nil {
return "", nil return "", err
} }
return ns.deps.PathSpec.RelURL(ss, false), nil return ns.deps.PathSpec.RelURL(ss, false), nil
@ -74,7 +74,7 @@ func (ns *Namespace) RelURL(s any) (string, error) {
func (ns *Namespace) URLize(s any) (string, error) { func (ns *Namespace) URLize(s any) (string, error) {
ss, err := cast.ToStringE(s) ss, err := cast.ToStringE(s)
if err != nil { if err != nil {
return "", nil return "", err
} }
return ns.deps.PathSpec.URLize(ss), nil return ns.deps.PathSpec.URLize(ss), nil
} }
@ -84,7 +84,7 @@ func (ns *Namespace) URLize(s any) (string, error) {
func (ns *Namespace) Anchorize(s any) (string, error) { func (ns *Namespace) Anchorize(s any) (string, error) {
ss, err := cast.ToStringE(s) ss, err := cast.ToStringE(s)
if err != nil { if err != nil {
return "", nil return "", err
} }
return ns.deps.ContentSpec.SanitizeAnchorName(ss), nil return ns.deps.ContentSpec.SanitizeAnchorName(ss), nil
} }