Browse code

Run 'gofmt -s -w'

Tianon Gravi authored on 2014/01/07 14:14:35
Showing 6 changed files
... ...
@@ -1,8 +1,8 @@
1 1
 package engine
2 2
 
3 3
 import (
4
-	"path"
5 4
 	"net/http"
5
+	"path"
6 6
 )
7 7
 
8 8
 // ServeHTTP executes a job as specified by the http request `r`, and sends the
... ...
@@ -22,7 +22,7 @@ func (eng *Engine) ServeHTTP(w http.ResponseWriter, r *http.Request) {
22 22
 		jobArgs = []string{}
23 23
 	}
24 24
 	w.Header().Set("Job-Name", jobName)
25
-	for _, arg := range(jobArgs) {
25
+	for _, arg := range jobArgs {
26 26
 		w.Header().Add("Job-Args", arg)
27 27
 	}
28 28
 	job := eng.Job(jobName, jobArgs...)
... ...
@@ -1,8 +1,8 @@
1 1
 package docker
2 2
 
3 3
 import (
4
-	"os"
5 4
 	"io"
5
+	"os"
6 6
 )
7 7
 
8 8
 func CopyFile(dstFile, srcFile *os.File) error {
... ...
@@ -25,8 +25,8 @@ btrfs_reflink(int fd_out, int fd_in)
25 25
 import "C"
26 26
 
27 27
 import (
28
-	"os"
29 28
 	"io"
29
+	"os"
30 30
 	"syscall"
31 31
 )
32 32
 
... ...
@@ -322,7 +322,6 @@ func migratePortMappings(config *Config, hostConfig *HostConfig) error {
322 322
 	return nil
323 323
 }
324 324
 
325
-
326 325
 // Links come in the format of
327 326
 // name:alias
328 327
 func parseLink(rawLink string) (map[string]string, error) {
... ...
@@ -781,7 +781,7 @@ func ParseHost(defaultHost string, defaultPort int, defaultUnix, addr string) (s
781 781
 		host  string
782 782
 		port  int
783 783
 	)
784
-  addr = strings.TrimSpace(addr)
784
+	addr = strings.TrimSpace(addr)
785 785
 	switch {
786 786
 	case strings.HasPrefix(addr, "unix://"):
787 787
 		proto = "unix"
... ...
@@ -316,9 +316,9 @@ func TestParseHost(t *testing.T) {
316 316
 	if addr, err := ParseHost(defaultHttpHost, defaultHttpPort, defaultUnix, "tcp://:7777"); err != nil || addr != "tcp://127.0.0.1:7777" {
317 317
 		t.Errorf("tcp://:7777 -> expected tcp://127.0.0.1:7777, got %s", addr)
318 318
 	}
319
-  if addr, err := ParseHost(defaultHttpHost, defaultHttpPort, defaultUnix, ""); err != nil || addr != "unix:///var/run/docker.sock" {
320
-    t.Errorf("empty argument -> expected unix:///var/run/docker.sock, got %s", addr)
321
-  }
319
+	if addr, err := ParseHost(defaultHttpHost, defaultHttpPort, defaultUnix, ""); err != nil || addr != "unix:///var/run/docker.sock" {
320
+		t.Errorf("empty argument -> expected unix:///var/run/docker.sock, got %s", addr)
321
+	}
322 322
 	if addr, err := ParseHost(defaultHttpHost, defaultHttpPort, defaultUnix, "unix:///var/run/docker.sock"); err != nil || addr != "unix:///var/run/docker.sock" {
323 323
 		t.Errorf("unix:///var/run/docker.sock -> expected unix:///var/run/docker.sock, got %s", addr)
324 324
 	}