Un-gofmt ./vendor

tianon · tianon · commit e8ffc2eee00b · 2014-01-14T10:54:19.000-07:00
We can't be modifying this except to update from upstream.

Docker-DCO-1.1-Signed-off-by: Andrew Page &lt;admwiggin@gmail.com&gt; (github: tianon)
diff --git a/vendor/src/github.com/gorilla/context/context.go b/vendor/src/github.com/gorilla/context/context.go
@@ -92,7 +92,7 @@ func Purge(maxAge int) int {
 		datat = make(map[*http.Request]int64)
 	} else {
 		min := time.Now().Unix() - int64(maxAge)
-		for r := range data {
+		for r, _ := range data {
 			if datat[r] < min {
 				clear(r)
 				count++
diff --git a/vendor/src/github.com/gorilla/mux/old_test.go b/vendor/src/github.com/gorilla/mux/old_test.go
@@ -96,8 +96,8 @@ func TestRouteMatchers(t *testing.T) {
 		method = "GET"
 		headers = map[string]string{"X-Requested-With": "XMLHttpRequest"}
 		resultVars = map[bool]map[string]string{
-			true:  {"var1": "www", "var2": "product", "var3": "42"},
-			false: {},
+			true:  map[string]string{"var1": "www", "var2": "product", "var3": "42"},
+			false: map[string]string{},
 		}
 	}
 
@@ -110,8 +110,8 @@ func TestRouteMatchers(t *testing.T) {
 		method = "POST"
 		headers = map[string]string{"Content-Type": "application/json"}
 		resultVars = map[bool]map[string]string{
-			true:  {"var4": "google", "var5": "product", "var6": "42"},
-			false: {},
+			true:  map[string]string{"var4": "google", "var5": "product", "var6": "42"},
+			false: map[string]string{},
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ func TestRouteMatchers(t *testing.T) {`
`96`	`96`	`method = "GET"`
`97`	`97`	`headers = map[string]string{"X-Requested-With": "XMLHttpRequest"}`
`98`	`98`	`resultVars = map[bool]map[string]string{`
`99`		`- true: {"var1": "www", "var2": "product", "var3": "42"},`
`100`		`- false: {},`
	`99`	`+ true: map[string]string{"var1": "www", "var2": "product", "var3": "42"},`
	`100`	`+ false: map[string]string{},`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`@@ -110,8 +110,8 @@ func TestRouteMatchers(t *testing.T) {`
`110`	`110`	`method = "POST"`
`111`	`111`	`headers = map[string]string{"Content-Type": "application/json"}`
`112`	`112`	`resultVars = map[bool]map[string]string{`
`113`		`- true: {"var4": "google", "var5": "product", "var6": "42"},`
`114`		`- false: {},`
	`113`	`+ true: map[string]string{"var4": "google", "var5": "product", "var6": "42"},`
	`114`	`+ false: map[string]string{},`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`