blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lint: work nicely with wrapped errors (errorlint)

Browse source 
Error wrapping as introduced in Go 1.13 adds some additional logic to
use for comparing errors and adding information to it.

Signed-off-by: Moritz Poldrack <moritz@poldrack.dev>
Acked-by: Robin Jarry <robin@jarry.cc>
This commit is contained in:
Moritz Poldrack 2022-07-31 15:15:27 +02:00 • committed by Robin Jarry
parent 978d35d356
commit 70bfcfef42
26 changed files with 163 additions and 158 deletions
widgets
compose.go

8
widgets/compose.go
View file

@ -202,7 +202,7 @@ func (c *Composer) SetAttachKey(attach bool) error {
if found {
err := c.DeleteAttachment(name)
if err != nil {
return fmt.Errorf("failed to delete attachment '%s: %v", name, err)
return fmt.Errorf("failed to delete attachment '%s: %w", name, err)
}
} else {
attach = !attach
@ -259,7 +259,7 @@ func (c *Composer) SetSign(sign bool) error {
err := c.updateCrypto()
if err != nil {
c.sign = !sign
return fmt.Errorf("Cannot sign message: %v", err)
return fmt.Errorf("Cannot sign message: %w", err)
}
return nil
}
@ -403,7 +403,7 @@ func (c *Composer) AddTemplate(template string, data interface{}) error {
mr, err := mail.CreateReader(templateText)
if err != nil {
return fmt.Errorf("Template loading failed: %v", err)
return fmt.Errorf("Template loading failed: %w", err)
}
// copy the headers contained in the template to the compose headers
@ -414,7 +414,7 @@ func (c *Composer) AddTemplate(template string, data interface{}) error {
part, err := mr.NextPart()
if err != nil {
return fmt.Errorf("Could not get body of template: %v", err)
return fmt.Errorf("Could not get body of template: %w", err)
}
c.AppendContents(part.Body)