codeorg: remove dependency on github.com/pkg/errors

cmd/ghwc/commands/accelerator.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +24,7 @@ var acceleratorCmd = &cobra.Command{
 func showAccelerator(cmd *cobra.Command, args []string) error {
 	accel, err := ghw.Accelerator(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting Accelerator info")
+		return fmt.Errorf("error getting Accelerator info: %w", err)
 	}
 
 	switch outputFormat {

cmd/ghwc/commands/baseboard.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +24,7 @@ var baseboardCmd = &cobra.Command{
 func showBaseboard(cmd *cobra.Command, args []string) error {
 	baseboard, err := ghw.Baseboard(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting baseboard info")
+		return fmt.Errorf("error getting baseboard info: %w", err)
 	}
 
 	switch outputFormat {

cmd/ghwc/commands/bios.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +24,7 @@ var biosCmd = &cobra.Command{
 func showBIOS(cmd *cobra.Command, args []string) error {
 	bios, err := ghw.BIOS(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting BIOS info")
+		return fmt.Errorf("error getting BIOS info: %w", err)
 	}
 
 	switch outputFormat {

cmd/ghwc/commands/block.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +24,7 @@ var blockCmd = &cobra.Command{
 func showBlock(cmd *cobra.Command, args []string) error {
 	block, err := ghw.Block(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting block device info")
+		return fmt.Errorf("error getting block device info: %w", err)
 	}
 
 	switch outputFormat {

cmd/ghwc/commands/chassis.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +24,7 @@ var chassisCmd = &cobra.Command{
 func showChassis(cmd *cobra.Command, args []string) error {
 	chassis, err := ghw.Chassis(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting chassis info")
+		return fmt.Errorf("error getting chassis info: %w", err)
 	}
 
 	switch outputFormat {

cmd/ghwc/commands/cpu.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -27,7 +26,7 @@ var cpuCmd = &cobra.Command{
 func showCPU(cmd *cobra.Command, args []string) error {
 	cpu, err := ghw.CPU(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting CPU info")
+		return fmt.Errorf("error getting CPU info: %w", err)
 	}
 
 	switch outputFormat {

cmd/ghwc/commands/gpu.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +24,7 @@ var gpuCmd = &cobra.Command{
 func showGPU(cmd *cobra.Command, args []string) error {
 	gpu, err := ghw.GPU(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting GPU info")
+		return fmt.Errorf("error getting GPU info: %w", err)
 	}
 
 	switch outputFormat {

cmd/ghwc/commands/memory.go

@@ -7,8 +7,9 @@
 package commands
 
 import (
+	"fmt"
+
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -23,7 +24,7 @@ var memoryCmd = &cobra.Command{
 func showMemory(cmd *cobra.Command, args []string) error {
 	mem, err := ghw.Memory(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting memory info")
+		return fmt.Errorf("error getting memory info: %w", err)
 	}
 
 	printInfo(mem)

cmd/ghwc/commands/net.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +24,7 @@ var netCmd = &cobra.Command{
 func showNetwork(cmd *cobra.Command, args []string) error {
 	net, err := ghw.Network(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting network info")
+		return fmt.Errorf("error getting network info: %w", err)
 	}
 
 	switch outputFormat {

cmd/ghwc/commands/pci.go

@@ -7,8 +7,9 @@
 package commands
 
 import (
+	"fmt"
+
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -23,7 +24,7 @@ var pciCmd = &cobra.Command{
 func showPCI(cmd *cobra.Command, args []string) error {
 	pci, err := ghw.PCI(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting PCI info")
+		return fmt.Errorf("error getting PCI info: %w", err)
 	}
 
 	printInfo(pci)

cmd/ghwc/commands/product.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +24,7 @@ var productCmd = &cobra.Command{
 func showProduct(cmd *cobra.Command, args []string) error {
 	product, err := ghw.Product(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting product info")
+		return fmt.Errorf("error getting product info: %w", err)
 	}
 
 	switch outputFormat {

cmd/ghwc/commands/root.go

@@ -14,7 +14,6 @@ import (
 	"github.com/jaypipes/ghw"
 	"github.com/jaypipes/ghw/internal/config"
 	"github.com/jaypipes/ghw/pkg/snapshot"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -117,13 +116,13 @@ func showAll(cmd *cobra.Command, args []string) error {
 	case outputFormatJSON:
 		host, err := ghw.Host()
 		if err != nil {
-			return errors.Wrap(err, "error getting host info")
+			return fmt.Errorf("error getting host info: %w", err)
 		}
 		fmt.Printf("%s\n", host.JSONString(pretty))
 	case outputFormatYAML:
 		host, err := ghw.Host()
 		if err != nil {
-			return errors.Wrap(err, "error getting host info")
+			return fmt.Errorf("error getting host info: %w", err)
 		}
 		fmt.Printf("%s", host.YAMLString())
 	}

cmd/ghwc/commands/topology.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +24,7 @@ var topologyCmd = &cobra.Command{
 func showTopology(cmd *cobra.Command, args []string) error {
 	topology, err := ghw.Topology(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting topology info")
+		return fmt.Errorf("error getting topology info: %w", err)
 	}
 
 	switch outputFormat {

cmd/ghwc/commands/usb.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 
 	"github.com/jaypipes/ghw"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +24,7 @@ var usbCmd = &cobra.Command{
 func showUSB(cmd *cobra.Command, args []string) error {
 	usb, err := ghw.USB(cmd.Context())
 	if err != nil {
-		return errors.Wrap(err, "error getting USB info")
+		return fmt.Errorf("error getting USB info: %w", err)
 	}
 
 	switch outputFormat {

go.mod

@@ -4,7 +4,6 @@ go 1.21
 
 require (
 	github.com/jaypipes/pcidb v1.1.1
-	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.9.1
 	github.com/stretchr/testify v1.11.1
 	github.com/yusufpapurcu/wmi v1.2.4

go.sum

@@ -8,8 +8,6 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
 github.com/jaypipes/pcidb v1.1.1 h1:QmPhpsbmmnCwZmHeYAATxEaoRuiMAJusKYkUncMC0ro=
 github.com/jaypipes/pcidb v1.1.1/go.mod h1:x27LT2krrUgjf875KxQXKB0Ha/YXLdZRVmw6hH0G7g8=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

pkg/accelerator/accelerator_stub.go

@@ -10,9 +10,8 @@ package accelerator
 
 import (
 	"context"
+	"errors"
 	"runtime"
-
-	"github.com/pkg/errors"
 )
 
 func (i *Info) load(ctx context.Context) error {

pkg/baseboard/baseboard_stub.go

@@ -10,9 +10,8 @@ package baseboard
 
 import (
 	"context"
+	"errors"
 	"runtime"
-
-	"github.com/pkg/errors"
 )
 
 func (i *Info) load(ctx context.Context) error {

pkg/bios/bios_stub.go

@@ -10,9 +10,8 @@ package bios
 
 import (
 	"context"
+	"errors"
 	"runtime"
-
-	"github.com/pkg/errors"
 )
 
 func (i *Info) load(ctx context.Context) error {

pkg/block/block_darwin.go

@@ -13,7 +13,6 @@ import (
 	"path"
 	"strings"
 
-	"github.com/pkg/errors"
 	"howett.net/plist"
 
 	"github.com/jaypipes/ghw/internal/config"
@@ -101,12 +100,12 @@ type ioregPlist struct {
 func getDiskUtilListPlist() (*diskUtilListPlist, error) {
 	out, err := exec.Command("diskutil", "list", "-plist").Output()
 	if err != nil {
-		return nil, errors.Wrap(err, "diskutil list failed")
+		return nil, fmt.Errorf("diskutil list failed: %w", err)
 	}
 
 	var data diskUtilListPlist
 	if _, err := plist.Unmarshal(out, &data); err != nil {
-		return nil, errors.Wrap(err, "diskutil list plist unmarshal failed")
+		return nil, fmt.Errorf("diskutil list plist unmarshal failed: %w", err)
 	}
 
 	return &data, nil
@@ -115,12 +114,12 @@ func getDiskUtilListPlist() (*diskUtilListPlist, error) {
 func getDiskUtilInfoPlist(device string) (*diskUtilInfoPlist, error) {
 	out, err := exec.Command("diskutil", "info", "-plist", device).Output()
 	if err != nil {
-		return nil, errors.Wrapf(err, "diskutil info for %q failed", device)
+		return nil, fmt.Errorf("diskutil info for %q failed: %w", device, err)
 	}
 
 	var data diskUtilInfoPlist
 	if _, err := plist.Unmarshal(out, &data); err != nil {
-		return nil, errors.Wrapf(err, "diskutil info plist unmarshal for %q failed", device)
+		return nil, fmt.Errorf("diskutil info plist unmarshal for %q failed: %w", device, err)
 	}
 
 	return &data, nil
@@ -138,18 +137,18 @@ func getIoregPlist(ioDeviceTreePath string) (*ioregPlist, error) {
 	}
 	out, err := exec.Command(args[0], args[1:]...).Output()
 	if err != nil {
-		return nil, errors.Wrapf(err, "ioreg query for %q failed", ioDeviceTreePath)
+		return nil, fmt.Errorf("ioreg query for %q failed: %w", ioDeviceTreePath, err)
 	}
 	if out == nil || len(out) == 0 {
 		return nil, nil
 	}
 
 	var data []ioregPlist
 	if _, err := plist.Unmarshal(out, &data); err != nil {
-		return nil, errors.Wrapf(err, "ioreg unmarshal for %q failed", ioDeviceTreePath)
+		return nil, fmt.Errorf("ioreg unmarshal for %q failed: %w", ioDeviceTreePath, err)
 	}
 	if len(data) != 1 {
-		err := errors.Errorf(
+		err := fmt.Errorf(
 			"ioreg unmarshal resulted in %d I/O device tree nodes "+
 				"for path %q (expected 1)",
 			len(data), ioDeviceTreePath,
@@ -162,7 +161,7 @@ func getIoregPlist(ioDeviceTreePath string) (*ioregPlist, error) {
 
 func makePartition(disk, s diskOrPartitionPlistNode, isAPFS bool) (*Partition, error) {
 	if s.Size < 0 {
-		return nil, errors.Errorf("invalid size %q of partition %q", s.Size, s.DeviceIdentifier)
+		return nil, fmt.Errorf("invalid size %q of partition %q", s.Size, s.DeviceIdentifier)
 	}
 
 	var partType string
@@ -230,15 +229,15 @@ func (info *Info) load(ctx context.Context) error {
 
 	for _, disk := range listPlist.AllDisksAndPartitions {
 		if disk.Size < 0 {
-			return errors.Errorf("invalid size %q of disk %q", disk.Size, disk.DeviceIdentifier)
+			return fmt.Errorf("invalid size %q of disk %q", disk.Size, disk.DeviceIdentifier)
 		}
 
 		infoPlist, err := getDiskUtilInfoPlist(disk.DeviceIdentifier)
 		if err != nil {
 			return err
 		}
 		if infoPlist.DeviceBlockSize < 0 {
-			return errors.Errorf("invalid block size %q of disk %q", infoPlist.DeviceBlockSize, disk.DeviceIdentifier)
+			return fmt.Errorf("invalid block size %q of disk %q", infoPlist.DeviceBlockSize, disk.DeviceIdentifier)
 		}
 
 		busPath := strings.TrimPrefix(infoPlist.DeviceTreePath, "IODeviceTree:")

pkg/block/block_stub.go

@@ -10,9 +10,8 @@ package block
 
 import (
 	"context"
+	"errors"
 	"runtime"
-
-	"github.com/pkg/errors"
 )
 
 func (i *Info) load(_ context.Context) error {