lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do some gofmt simplifications

Browse Source
This commit is contained in:
James Shubin
2016-07-25 20:56:33 -04:00
parent c1605a4f22
commit e28c1266cf
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etcd.go
View File

@@ -1142,7 +1142,7 @@ func (obj *EmbdEtcd) volunteerCallback(re *RE) error {
} }
volunteers := []string{} // get keys volunteers := []string{} // get keys
for k, _ := range volunteersMap { for k := range volunteersMap {
volunteers = append(volunteers, k) volunteers = append(volunteers, k)
} }
sort.Strings(volunteers) // deterministic order sort.Strings(volunteers) // deterministic order

6
exec.go
View File

@@ -125,7 +125,7 @@ func (obj *ExecRes) Watch(processChan chan Event) {
cmdName = split[0] cmdName = split[0]
//d, _ := os.Getwd() // TODO: how does this ever error ? //d, _ := os.Getwd() // TODO: how does this ever error ?
//cmdName = path.Join(d, cmdName) //cmdName = path.Join(d, cmdName)
cmdArgs = split[1:len(split)] cmdArgs = split[1:]
} else { } else {
cmdName = obj.Shell // usually bash, or sh cmdName = obj.Shell // usually bash, or sh
cmdArgs = []string{"-c", obj.WatchCmd} cmdArgs = []string{"-c", obj.WatchCmd}
@@ -230,7 +230,7 @@ func (obj *ExecRes) CheckApply(apply bool) (checkok bool, err error) {
cmdName = split[0] cmdName = split[0]
//d, _ := os.Getwd() // TODO: how does this ever error ? //d, _ := os.Getwd() // TODO: how does this ever error ?
//cmdName = path.Join(d, cmdName) //cmdName = path.Join(d, cmdName)
cmdArgs = split[1:len(split)] cmdArgs = split[1:]
} else { } else {
cmdName = obj.IfShell // usually bash, or sh cmdName = obj.IfShell // usually bash, or sh
cmdArgs = []string{"-c", obj.IfCmd} cmdArgs = []string{"-c", obj.IfCmd}
@@ -266,7 +266,7 @@ func (obj *ExecRes) CheckApply(apply bool) (checkok bool, err error) {
cmdName = split[0] cmdName = split[0]
//d, _ := os.Getwd() // TODO: how does this ever error ? //d, _ := os.Getwd() // TODO: how does this ever error ?
//cmdName = path.Join(d, cmdName) //cmdName = path.Join(d, cmdName)
cmdArgs = split[1:len(split)] cmdArgs = split[1:]
} else { } else {
cmdName = obj.Shell // usually bash, or sh cmdName = obj.Shell // usually bash, or sh
cmdArgs = []string{"-c", obj.Cmd} cmdArgs = []string{"-c", obj.Cmd}

4
misc.go
View File

@@ -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! // it turns out that's not allowed. I know we don't have generics, but come on!
func StrMapKeys(m map[string]string) []string { func StrMapKeys(m map[string]string) []string {
result := []string{} result := []string{}
for k, _ := range m { for k := range m {
result = append(result, k) result = append(result, k)
} }
sort.Strings(result) // deterministic order sort.Strings(result) // deterministic order
@@ -108,7 +108,7 @@ func StrMapKeys(m map[string]string) []string {
func StrMapKeysUint64(m map[string]uint64) []string { func StrMapKeysUint64(m map[string]uint64) []string {
result := []string{} result := []string{}
for k, _ := range m { for k := range m {
result = append(result, k) result = append(result, k)
} }
sort.Strings(result) // deterministic order sort.Strings(result) // deterministic order

2
pgraph.go
View File

@@ -437,7 +437,7 @@ func (g *Graph) OutDegree() map[*Vertex]int {
for k := range g.Adjacency { for k := range g.Adjacency {
result[k] = 0 // initialize result[k] = 0 // initialize
for _ = range g.Adjacency[k] { for range g.Adjacency[k] {
result[k]++ result[k]++
} }
} }

2
pgraph_test.go
View File

@@ -807,7 +807,7 @@ func (g *Graph) fullPrint() (str string) {
// helper function // helper function
func runGraphCmp(t *testing.T, g1, g2 *Graph) { func runGraphCmp(t *testing.T, g1, g2 *Graph) {
ch := g1.autoGroup(&testGrouper{}) // edits the 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 // pass
} }
err := GraphCmp(g1, g2) err := GraphCmp(g1, g2)