Fix go vet warnings

pumpchaser · Jun 21, 2016 · c6ccf00 · c6ccf00
1 parent b879342
commit c6ccf00
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/cmd_reload.go b/cmd_reload.go
@@ -14,12 +14,10 @@ var CmdReload = &Cmd{
 		}
 
 		foundRC := config.FindRC()
-		if foundRC != nil {
-			return foundRC.Touch()
-		} else {
+		if foundRC == nil {
 			return fmt.Errorf(".envrc not found")
 		}
 
-		return nil
+		return foundRC.Touch()
 	},
 }
diff --git a/env_diff_test.go b/env_diff_test.go
@@ -12,15 +12,15 @@ func TestEnvDiff(t *testing.T) {
 
 	diff2, err := LoadEnvDiff(out)
 	if err != nil {
-		t.Errorf("parse error", err)
+		t.Error("parse error", err)
 	}
 
 	if len(diff2.Prev) != 1 {
-		t.Errorf("len(diff2.prev) != 1", len(diff2.Prev))
+		t.Error("len(diff2.prev) != 1", len(diff2.Prev))
 	}
 
 	if len(diff2.Next) != 1 {
-		t.Errorf("len(diff2.next) != 0", len(diff2.Next))
+		t.Error("len(diff2.next) != 0", len(diff2.Next))
 	}
 }
 

diff --git a/env_test.go b/env_test.go
@@ -11,14 +11,14 @@ func TestEnv(t *testing.T) {
 
 	env2, err := LoadEnv(out)
 	if err != nil {
-		t.Errorf("parse error", err)
+		t.Error("parse error", err)
 	}
 
 	if env2["FOO"] != "bar" {
-		t.Errorf("FOO != bar", env2["FOO"])
+		t.Error("FOO != bar", env2["FOO"])
 	}
 
 	if len(env2) != 1 {
-		t.Errorf("len != 1", len(env2))
+		t.Error("len != 1", len(env2))
 	}
 }