favor %w over %s for error wrapping

vilmibm · vilmibm · commit bd907ec74dd7 · 2020-04-20T12:22:12.000-05:00
diff --git a/command/config.go b/command/config.go
@@ -99,12 +99,12 @@ func configSet(cmd *cobra.Command, args []string) error {
 
 	err = cfg.Set(hostname, key, value)
 	if err != nil {
-		return fmt.Errorf("failed to set %q to %q: %s", key, value, err)
+		return fmt.Errorf("failed to set %q to %q: %w", key, value, err)
 	}
 
 	err = cfg.Write()
 	if err != nil {
-		return fmt.Errorf("failed to write config to disk: %s", err)
+		return fmt.Errorf("failed to write config to disk: %w", err)
 	}
 
 	return nil
diff --git a/context/config_file.go b/context/config_file.go
@@ -142,7 +142,7 @@ func migrateConfig(fn string, root *yaml.Node) error {
 
 	err = BackupConfigFile(fn)
 	if err != nil {
-		return fmt.Errorf("failed to back up existing config: %s", err)
+		return fmt.Errorf("failed to back up existing config: %w", err)
 	}
 
 	return WriteConfigFile(fn, newConfig)
@@ -162,7 +162,7 @@ func ParseConfig(fn string) (Config, error) {
 
 		_, root, err = parseConfigFile(fn)
 		if err != nil {
-			return nil, fmt.Errorf("failed to reparse migrated config: %s", err)
+			return nil, fmt.Errorf("failed to reparse migrated config: %w", err)
 		}
 	}
 
diff --git a/context/config_type.go b/context/config_type.go
@@ -132,7 +132,7 @@ func (c *fileConfig) Set(hostname, key, value string) error {
 func (c *fileConfig) configForHost(hostname string) (*HostConfig, error) {
 	hosts, err := c.Hosts()
 	if err != nil {
-		return nil, fmt.Errorf("failed to parse hosts config: %s", err)
+		return nil, fmt.Errorf("failed to parse hosts config: %w", err)
 	}
 
 	for _, hc := range hosts {
@@ -159,12 +159,12 @@ func (c *fileConfig) Hosts() ([]*HostConfig, error) {
 
 	_, hostsEntry, err := c.FindEntry("hosts")
 	if err != nil {
-		return nil, fmt.Errorf("could not find hosts config: %s", err)
+		return nil, fmt.Errorf("could not find hosts config: %w", err)
 	}
 
 	hostConfigs, err := c.parseHosts(hostsEntry)
 	if err != nil {
-		return nil, fmt.Errorf("could not parse hosts config: %s", err)
+		return nil, fmt.Errorf("could not parse hosts config: %w", err)
 	}
 
 	c.hosts = hostConfigs

Original file line number	Diff line number	Diff line change
`@@ -99,12 +99,12 @@ func configSet(cmd *cobra.Command, args []string) error {`
`99`	`99`
`100`	`100`	`err = cfg.Set(hostname, key, value)`
`101`	`101`	`if err != nil {`
`102`		`- return fmt.Errorf("failed to set %q to %q: %s", key, value, err)`
	`102`	`+ return fmt.Errorf("failed to set %q to %q: %w", key, value, err)`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`err = cfg.Write()`
`106`	`106`	`if err != nil {`
`107`		`- return fmt.Errorf("failed to write config to disk: %s", err)`
	`107`	`+ return fmt.Errorf("failed to write config to disk: %w", err)`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ func migrateConfig(fn string, root *yaml.Node) error {`
`142`	`142`
`143`	`143`	`err = BackupConfigFile(fn)`
`144`	`144`	`if err != nil {`
`145`		`- return fmt.Errorf("failed to back up existing config: %s", err)`
	`145`	`+ return fmt.Errorf("failed to back up existing config: %w", err)`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`return WriteConfigFile(fn, newConfig)`
`@@ -162,7 +162,7 @@ func ParseConfig(fn string) (Config, error) {`
`162`	`162`
`163`	`163`	`_, root, err = parseConfigFile(fn)`
`164`	`164`	`if err != nil {`
`165`		`- return nil, fmt.Errorf("failed to reparse migrated config: %s", err)`
	`165`	`+ return nil, fmt.Errorf("failed to reparse migrated config: %w", err)`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func (c *fileConfig) Set(hostname, key, value string) error {`
`132`	`132`	`func (c fileConfig) configForHost(hostname string) (HostConfig, error) {`
`133`	`133`	`hosts, err := c.Hosts()`
`134`	`134`	`if err != nil {`
`135`		`- return nil, fmt.Errorf("failed to parse hosts config: %s", err)`
	`135`	`+ return nil, fmt.Errorf("failed to parse hosts config: %w", err)`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`for _, hc := range hosts {`
`@@ -159,12 +159,12 @@ func (c fileConfig) Hosts() ([]HostConfig, error) {`
`159`	`159`
`160`	`160`	`_, hostsEntry, err := c.FindEntry("hosts")`
`161`	`161`	`if err != nil {`
`162`		`- return nil, fmt.Errorf("could not find hosts config: %s", err)`
	`162`	`+ return nil, fmt.Errorf("could not find hosts config: %w", err)`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`hostConfigs, err := c.parseHosts(hostsEntry)`
`166`	`166`	`if err != nil {`
`167`		`- return nil, fmt.Errorf("could not parse hosts config: %s", err)`
	`167`	`+ return nil, fmt.Errorf("could not parse hosts config: %w", err)`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`c.hosts = hostConfigs`