Merge lp:~jtv/gwacl/gofmt-simplify into lp:gwacl

[Jeroen T. Vermeulen]

Clean up some small nuisances using gofmt's -s ("simplify") option.

Maybe we should always run this as part of formatting: gofmt's “-s” option streamlines the code a bit.

I also tried it on gomaasapi and even juju-core, and the only things I saw it clean up were:

 1. Unneeded specifications on initializers, such as array literals inside array literals. That's what you see here.

 2. Use of “_” as the optional second iteration output: “for x, _ := range y” becomes “for x := range y”.

So it looks pretty safe. There are also options to list files that gofmt _would_ change if you allowed it to, and for showing what changes it would like to make.

Jeroen

[Raphaël Badin (rvb)]

Looks good! I didn't know that option existed.

> Maybe we should always run this as part of formatting: gofmt's “-s” option streamlines the code a bit.

I think we should.

review: Approve

=== modified file 'poller_test.go'
--- poller_test.go	2013-03-28 10:46:07 +0000
+++ poller_test.go	2013-03-29 01:34:22 +0000
@@ -130,14 +130,14 @@
     poller := NewOperationPoller(suite.makeAPI(c), "operationID")
     notDoneResponses := []x509Response{
         // 'InProgress' response.
-        x509Response{
+        {
             Body:       []byte(fmt.Sprintf(operationXMLTemplate, "InProgress")),
             StatusCode: http.StatusOK,
         },
         // Error statuses.
-        x509Response{StatusCode: http.StatusNotFound},
-        x509Response{StatusCode: http.StatusBadRequest},
-        x509Response{StatusCode: http.StatusInternalServerError},
+        {StatusCode: http.StatusNotFound},
+        {StatusCode: http.StatusBadRequest},
+        {StatusCode: http.StatusInternalServerError},
     }
     for _, response := range notDoneResponses {
         isDone, _ := poller.isDone(&response)

=== modified file 'storage_test.go'
--- storage_test.go	2013-03-27 07:16:45 +0000
+++ storage_test.go	2013-03-29 01:34:22 +0000
@@ -106,10 +106,10 @@
 
     observed := toLowerKeys(values)
     expected := map[string][]string{
-        "foo":   []string{"bar", "baz"},
-        "alpha": []string{"delta", "gamma"},
-        "quux":  []string{"flobble"},
-        "big":   []string{"Big", "Big", "Data", "Little"},
+        "foo":   {"bar", "baz"},
+        "alpha": {"delta", "gamma"},
+        "quux":  {"flobble"},
+        "big":   {"Big", "Big", "Data", "Little"},
     }
 
     c.Check(observed, DeepEquals, expected)
@@ -117,10 +117,10 @@
 
 func (suite *TestComposeCanonicalizedResource) TestEncodeParams(c *C) {
     input := map[string][]string{
-        "foo":   []string{"bar", "baz"},
-        "alpha": []string{"delta", "gamma"},
-        "quux":  []string{"flobble"},
-        "big":   []string{"Big", "Big", "Data", "Little"},
+        "foo":   {"bar", "baz"},
+        "alpha": {"delta", "gamma"},
+        "quux":  {"flobble"},
+        "big":   {"Big", "Big", "Data", "Little"},
     }
 
     observed := encodeParams(input)

=== modified file 'test_helpers.go'
--- test_helpers.go	2013-03-27 08:44:24 +0000
+++ test_helpers.go	2013-03-29 01:34:22 +0000
@@ -167,7 +167,7 @@
     AffinityGroup := MakeRandomString(10)
     Location := MakeRandomString(10)
     GeoReplicationEnabled := BoolToString(MakeRandomBool())
-    ExtendedProperties := []ExtendedProperty{ExtendedProperty{
+    ExtendedProperties := []ExtendedProperty{{
         Name:  MakeRandomString(10),
         Value: MakeRandomString(10)}}
 

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-03-27 07:16:45 +0000
+++ xmlobjects_test.go	2013-03-29 01:34:22 +0000
@@ -522,7 +522,7 @@
 
     expected := &Metadata{
         Items: []MetadataItem{
-            MetadataItem{
+            {
                 XMLName: xml.Name{Local: "metadata-name"},
                 Value:   "metadata-value",
             },
@@ -567,7 +567,7 @@
         },
         Metadata: Metadata{
             Items: []MetadataItem{
-                MetadataItem{
+                {
                     XMLName: xml.Name{Local: "metadata-name"},
                     Value:   "metadata-value",
                 },
@@ -614,7 +614,7 @@
         Marker:     "marker-value",
         MaxResults: "max-results-value",
         Containers: []Container{
-            Container{
+            {
                 XMLName: xml.Name{Local: "Container"},
                 Name:    "name-value",
                 URL:     "url-value",
@@ -627,7 +627,7 @@
                 },
                 Metadata: Metadata{
                     Items: []MetadataItem{
-                        MetadataItem{
+                        {
                             XMLName: xml.Name{Local: "metadata-name"},
                             Value:   "metadata-value",
                         },
@@ -702,12 +702,12 @@
     expected := GetBlockList{
         XMLName: xml.Name{Local: "BlockList"},
         CommittedBlocks: []Block{
-            Block{
+            {
                 Name: "BlockId001",
                 Size: "4194304"},
         },
         UncommittedBlocks: []Block{
-            Block{
+            {
                 Name: "BlockId002",
                 Size: "1024"},
         },