Merge branch 'master' into incorrect-datetime-1970

Shlomi Noach · web-flow · commit 7821582693a4 · 2018-05-15T12:12:18.000+03:00
diff --git a/go/base/utils.go b/go/base/utils.go
@@ -40,10 +40,9 @@ func FileExists(fileName string) bool {
 func TouchFile(fileName string) error {
 	f, err := os.OpenFile(fileName, os.O_APPEND|os.O_CREATE, 0755)
 	if err != nil {
-		return (err)
+		return err
 	}
-	defer f.Close()
-	return nil
+	return f.Close()
 }
 
 // StringContainsAll returns true if `s` contains all non empty given `substrings`

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,9 @@ func FileExists(fileName string) bool {`
`40`	`40`	`func TouchFile(fileName string) error {`
`41`	`41`	`f, err := os.OpenFile(fileName, os.O_APPEND\|os.O_CREATE, 0755)`
`42`	`42`	`if err != nil {`
`43`		`- return (err)`
	`43`	`+ return err`
`44`	`44`	`}`
`45`		`- defer f.Close()`
`46`		`- return nil`
	`45`	`+ return f.Close()`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	// StringContainsAll returns true if `s` contains all non empty given `substrings`