Do some gofmt simplifications
This commit is contained in:
2
etcd.go
2
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
|
||||
|
||||
6
exec.go
6
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}
|
||||
|
||||
4
misc.go
4
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
|
||||
|
||||
@@ -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]++
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user