Merge pull request #15 from k-yomo/refactor-error-handling

Replace xerrors

cmd/fixtory/main.go

@@ -3,15 +3,15 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/fatih/color"
-	"github.com/k-yomo/fixtory"
-	"golang.org/x/xerrors"
 	"io"
 	"log"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
+
+	"github.com/fatih/color"
+	"github.com/k-yomo/fixtory"
 )
 
 var version string
@@ -56,11 +56,11 @@ func main() {
 	outputDir, _ := path.Split(outputPath)
 	newWriter := func() (io.Writer, func(), error) {
 		if err := os.MkdirAll(outputDir, 0755); err != nil {
-			return nil, nil, xerrors.Errorf("create directory: %w", err)
+			return nil, nil, fmt.Errorf("create directory: %w", err)
 		}
 		writer, err := os.Create(outputPath)
 		if err != nil {
-			return nil, nil, xerrors.Errorf("create output file: %w", err)
+			return nil, nil, fmt.Errorf("create output file: %w", err)
 		}
 		return writer, func() { _ = writer.Close() }, nil
 	}

generate.go

@@ -10,7 +10,6 @@ import (
 	"text/template"
 
 	"github.com/k-yomo/fixtory/pkg/astutil"
-	"golang.org/x/xerrors"
 )
 
 func Generate(targetDir string, outputDir string, types []string, pkgName string, newWriter func() (writer io.Writer, close func(), err error)) error {
@@ -69,7 +68,7 @@ func Generate(targetDir string, outputDir string, types []string, pkgName string
 				FieldNames: fieldNames,
 			}
 			if err := tpl.Execute(body, params); err != nil {
-				return xerrors.Errorf("execute factory template: %w", err)
+				return fmt.Errorf("execute factory template: %w", err)
 			}
 		}
 		if body.Len() == 0 {
@@ -99,22 +98,22 @@ func Generate(targetDir string, outputDir string, types []string, pkgName string
 		}
 		err = template.Must(template.New("fixtoryFile").Parse(fixtoryFileTpl)).Execute(out, params)
 		if err != nil {
-			return xerrors.Errorf("execute fixtoryFile template: %w", err)
+			return fmt.Errorf("execute fixtoryFile template: %w", err)
 		}
 
 		str, err := format.Source(out.Bytes())
 		if err != nil {
-			return xerrors.Errorf("format.Source: %w", err)
+			return fmt.Errorf("format.Source: %w", err)
 		}
 
 		writer, closeWriter, err := newWriter()
 		if err != nil {
-			return xerrors.Errorf("initialize writer: %w", err)
+			return fmt.Errorf("initialize writer: %w", err)
 		}
 		defer closeWriter()
 
 		if _, err := writer.Write(str); err != nil {
-			return xerrors.Errorf("write fixtory file: %w", err)
+			return fmt.Errorf("write fixtory file: %w", err)
 		}
 	}
 

go.mod

@@ -6,5 +6,5 @@ require (
 	github.com/fatih/color v1.13.0
 	github.com/google/go-cmp v0.5.6
 	golang.org/x/mod v0.5.1
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 )

pkg/astutil/astutil.go

@@ -1,17 +1,18 @@
 package astutil
 
 import (
+	"errors"
 	"fmt"
 	"go/ast"
 	"go/parser"
 	"go/token"
-	"golang.org/x/mod/modfile"
-	"golang.org/x/xerrors"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
 	"strings"
+
+	"golang.org/x/mod/modfile"
 )
 
 // AstPkgWalker represents ast package walker
@@ -68,7 +69,7 @@ func DirToAstWalker(targetDir string) (map[string]AstPkgWalker, error) {
 		parser.ParseComments,
 	)
 	if err != nil {
-		return nil, xerrors.Errorf("parser.ParseDir: %w", err)
+		return nil, fmt.Errorf("parser.ParseDir: %w", err)
 	}
 
 	m := make(map[string]AstPkgWalker, len(pkgMap))
@@ -93,7 +94,7 @@ func ParseAstPkg(fset *token.FileSet, pkg *ast.Package) (AstPkgWalker, error) {
 		var err error
 		dir, err = os.Getwd()
 		if err != nil {
-			return AstPkgWalker{}, xerrors.Errorf("get current directory: %w", err)
+			return AstPkgWalker{}, fmt.Errorf("get current directory: %w", err)
 		}
 	}
 	pkgPath, err := packageNameOfDir(dir)
@@ -183,7 +184,7 @@ func parsePackageImport(srcDir string) (string, error) {
 	// fall back to GOPATH mode
 	goPaths := os.Getenv("GOPATH")
 	if goPaths == "" {
-		return "", xerrors.New("GOPATH is not set")
+		return "", errors.New("GOPATH is not set")
 	}
 	goPathList := strings.Split(goPaths, string(os.PathListSeparator))
 	for _, goPath := range goPathList {
@@ -192,5 +193,5 @@ func parsePackageImport(srcDir string) (string, error) {
 			return filepath.ToSlash(strings.TrimPrefix(srcDir, sourceRoot)), nil
 		}
 	}
-	return "", xerrors.New("Source directory is outside GOPATH")
+	return "", errors.New("source directory is outside GOPATH")
 }