From e28c1266cf16e0821043a4ed93fb1c4ef4dc3f1e Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Mon, 25 Jul 2016 20:56:33 -0400
Subject: [PATCH] Do some gofmt simplifications

---
 etcd.go        | 2 +-
 exec.go        | 6 +++---
 misc.go        | 4 ++--
 pgraph.go      | 2 +-
 pgraph_test.go | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/etcd.go b/etcd.go
index 90ecb071..2bebf691 100644
--- a/etcd.go
+++ b/etcd.go
@@ -1142,7 +1142,7 @@ func (obj *EmbdEtcd) volunteerCallback(re *RE) error {
 	}
 
 	volunteers := []string{} // get keys
-	for k, _ := range volunteersMap {
+	for k := range volunteersMap {
 		volunteers = append(volunteers, k)
 	}
 	sort.Strings(volunteers) // deterministic order
diff --git a/exec.go b/exec.go
index 56f6b23b..1f102b1e 100644
--- a/exec.go
+++ b/exec.go
@@ -125,7 +125,7 @@ func (obj *ExecRes) Watch(processChan chan Event) {
 			cmdName = split[0]
 			//d, _ := os.Getwd() // TODO: how does this ever error ?
 			//cmdName = path.Join(d, cmdName)
-			cmdArgs = split[1:len(split)]
+			cmdArgs = split[1:]
 		} else {
 			cmdName = obj.Shell // usually bash, or sh
 			cmdArgs = []string{"-c", obj.WatchCmd}
@@ -230,7 +230,7 @@ func (obj *ExecRes) CheckApply(apply bool) (checkok bool, err error) {
 			cmdName = split[0]
 			//d, _ := os.Getwd() // TODO: how does this ever error ?
 			//cmdName = path.Join(d, cmdName)
-			cmdArgs = split[1:len(split)]
+			cmdArgs = split[1:]
 		} else {
 			cmdName = obj.IfShell // usually bash, or sh
 			cmdArgs = []string{"-c", obj.IfCmd}
@@ -266,7 +266,7 @@ func (obj *ExecRes) CheckApply(apply bool) (checkok bool, err error) {
 		cmdName = split[0]
 		//d, _ := os.Getwd() // TODO: how does this ever error ?
 		//cmdName = path.Join(d, cmdName)
-		cmdArgs = split[1:len(split)]
+		cmdArgs = split[1:]
 	} else {
 		cmdName = obj.Shell // usually bash, or sh
 		cmdArgs = []string{"-c", obj.Cmd}
diff --git a/misc.go b/misc.go
index fca0d14f..7f59212d 100644
--- a/misc.go
+++ b/misc.go
@@ -99,7 +99,7 @@ func ReverseStringList(in []string) []string {
 // it turns out that's not allowed. I know we don't have generics, but come on!
 func StrMapKeys(m map[string]string) []string {
 	result := []string{}
-	for k, _ := range m {
+	for k := range m {
 		result = append(result, k)
 	}
 	sort.Strings(result) // deterministic order
@@ -108,7 +108,7 @@ func StrMapKeys(m map[string]string) []string {
 
 func StrMapKeysUint64(m map[string]uint64) []string {
 	result := []string{}
-	for k, _ := range m {
+	for k := range m {
 		result = append(result, k)
 	}
 	sort.Strings(result) // deterministic order
diff --git a/pgraph.go b/pgraph.go
index 957314c6..79375bee 100644
--- a/pgraph.go
+++ b/pgraph.go
@@ -437,7 +437,7 @@ func (g *Graph) OutDegree() map[*Vertex]int {
 
 	for k := range g.Adjacency {
 		result[k] = 0 // initialize
-		for _ = range g.Adjacency[k] {
+		for range g.Adjacency[k] {
 			result[k]++
 		}
 	}
diff --git a/pgraph_test.go b/pgraph_test.go
index 9a616f29..c6b76010 100644
--- a/pgraph_test.go
+++ b/pgraph_test.go
@@ -807,7 +807,7 @@ func (g *Graph) fullPrint() (str string) {
 // helper function
 func runGraphCmp(t *testing.T, g1, g2 *Graph) {
 	ch := g1.autoGroup(&testGrouper{}) // edits the graph
-	for _ = range ch {                 // bleed the channel or it won't run :(
+	for range ch {                     // bleed the channel or it won't run :(
 		// pass
 	}
 	err := GraphCmp(g1, g2)