From d79b636dff87fe5120f5bdb71874d532f4764591 Mon Sep 17 00:00:00 2001
From: Benjamin Pflanz <bpflanz@adfin.com>
Date: Wed, 11 May 2016 12:02:21 -0400
Subject: [PATCH] Use idiomatic error messaging and variable naming, and don't
 make unnecessary changes.

---
 jsonenums.go     | 10 +++++-----
 parser/parser.go |  8 ++++----
 server/server.go |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jsonenums.go b/jsonenums.go
index 507ecb7..60346ee 100644
--- a/jsonenums.go
+++ b/jsonenums.go
@@ -92,16 +92,16 @@ func main() {
 	types := strings.Split(*typeNames, ",")
 
 	// Only one directory at a time can be processed, and the default is ".".
-	inDir := "."
+	dir := "."
 	if args := flag.Args(); len(args) == 1 {
-		inDir = args[0]
+		dir = args[0]
 	} else if len(args) > 1 {
 		log.Fatalf("only one directory at a time")
 	}
-	dir, err := filepath.Abs(inDir)
+	dir, err := filepath.Abs(dir)
 	if err != nil {
-		log.Fatalf("Unable to determine absolute filepath for requested path %s: %v",
-			inDir, err)
+		log.Fatalf("unable to determine absolute filepath for requested path %s: %v",
+			dir, err)
 	}
 
 	pkg, err := parser.ParsePackage(dir)
diff --git a/parser/parser.go b/parser/parser.go
index 26c524b..bc1d3eb 100644
--- a/parser/parser.go
+++ b/parser/parser.go
@@ -36,11 +36,11 @@ func ParsePackage(directory string) (*Package, error) {
 			build.Default.GOPATH, err)
 	}
 
-	loaderConf := loader.Config{TypeChecker: types.Config{FakeImportC: true}}
-	loaderConf.Import(relDir)
-	program, err := loaderConf.Load()
+	conf := loader.Config{TypeChecker: types.Config{FakeImportC: true}}
+	conf.Import(relDir)
+	program, err := conf.Load()
 	if err != nil {
-		return nil, fmt.Errorf("Couldn't load package: %v", err)
+		return nil, fmt.Errorf("couldn't load package: %v", err)
 	}
 
 	pkgInfo := program.Package(relDir)
diff --git a/server/server.go b/server/server.go
index 20e5b8b..b7bb514 100644
--- a/server/server.go
+++ b/server/server.go
@@ -47,7 +47,7 @@ func generateHandler(w http.ResponseWriter, r *http.Request) error {
 	}
 	defer os.RemoveAll(dir)
 
-	pkg, err := parser.ParsePackage(dir, "", "")
+	pkg, err := parser.ParsePackage(dir)
 	if err != nil {
 		return fmt.Errorf("parse package: %v", err)
 	}