From dada32c78b343e536e1779b8b57b8f89d7092bb8 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Mon, 11 May 2015 15:47:48 -0400
Subject: [PATCH] Early return

---
 restore.go                           | 15 ++++++++-------
 testdata/out/compress-memcopy.go     | 15 ++++++++-------
 testdata/out/compress-nomemcopy.go   | 15 ++++++++-------
 testdata/out/debug.go                | 15 ++++++++-------
 testdata/out/nocompress-memcopy.go   | 15 ++++++++-------
 testdata/out/nocompress-nomemcopy.go | 15 ++++++++-------
 6 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/restore.go b/restore.go
index a8329e8..b2c2409 100644
--- a/restore.go
+++ b/restore.go
@@ -39,14 +39,15 @@ func RestoreAsset(dir, name string) error {
 // RestoreAssets restores an asset under the given directory recursively
 func RestoreAssets(dir, name string) error {
         children, err := AssetDir(name)
-        if err != nil { // File
+        // File
+        if err != nil {
                 return RestoreAsset(dir, name)
-        } else { // Dir
-                for _, child := range children {
-                        err = RestoreAssets(dir, path.Join(name, child))
-                        if err != nil {
-                                return err
-                        }
+        }
+        // Dir
+        for _, child := range children {
+                err = RestoreAssets(dir, path.Join(name, child))
+                if err != nil {
+                        return err
                 }
         }
         return nil
diff --git a/testdata/out/compress-memcopy.go b/testdata/out/compress-memcopy.go
index 6aa985c..8e64124 100644
--- a/testdata/out/compress-memcopy.go
+++ b/testdata/out/compress-memcopy.go
@@ -288,14 +288,15 @@ func RestoreAsset(dir, name string) error {
 // RestoreAssets restores an asset under the given directory recursively
 func RestoreAssets(dir, name string) error {
         children, err := AssetDir(name)
-        if err != nil { // File
+        // File
+        if err != nil {
                 return RestoreAsset(dir, name)
-        } else { // Dir
-                for _, child := range children {
-                        err = RestoreAssets(dir, path.Join(name, child))
-                        if err != nil {
-                                return err
-                        }
+        }
+        // Dir
+        for _, child := range children {
+                err = RestoreAssets(dir, path.Join(name, child))
+                if err != nil {
+                        return err
                 }
         }
         return nil
diff --git a/testdata/out/compress-nomemcopy.go b/testdata/out/compress-nomemcopy.go
index eec352f..a4ecb47 100644
--- a/testdata/out/compress-nomemcopy.go
+++ b/testdata/out/compress-nomemcopy.go
@@ -298,14 +298,15 @@ func RestoreAsset(dir, name string) error {
 // RestoreAssets restores an asset under the given directory recursively
 func RestoreAssets(dir, name string) error {
         children, err := AssetDir(name)
-        if err != nil { // File
+        // File
+        if err != nil {
                 return RestoreAsset(dir, name)
-        } else { // Dir
-                for _, child := range children {
-                        err = RestoreAssets(dir, path.Join(name, child))
-                        if err != nil {
-                                return err
-                        }
+        }
+        // Dir
+        for _, child := range children {
+                err = RestoreAssets(dir, path.Join(name, child))
+                if err != nil {
+                        return err
                 }
         }
         return nil
diff --git a/testdata/out/debug.go b/testdata/out/debug.go
index bfe57bf..042eac4 100644
--- a/testdata/out/debug.go
+++ b/testdata/out/debug.go
@@ -239,14 +239,15 @@ func RestoreAsset(dir, name string) error {
 // RestoreAssets restores an asset under the given directory recursively
 func RestoreAssets(dir, name string) error {
         children, err := AssetDir(name)
-        if err != nil { // File
+        // File
+        if err != nil {
                 return RestoreAsset(dir, name)
-        } else { // Dir
-                for _, child := range children {
-                        err = RestoreAssets(dir, path.Join(name, child))
-                        if err != nil {
-                                return err
-                        }
+        }
+        // Dir
+        for _, child := range children {
+                err = RestoreAssets(dir, path.Join(name, child))
+                if err != nil {
+                        return err
                 }
         }
         return nil
diff --git a/testdata/out/nocompress-memcopy.go b/testdata/out/nocompress-memcopy.go
index 7748d52..c97ec2d 100644
--- a/testdata/out/nocompress-memcopy.go
+++ b/testdata/out/nocompress-memcopy.go
@@ -256,14 +256,15 @@ func RestoreAsset(dir, name string) error {
 // RestoreAssets restores an asset under the given directory recursively
 func RestoreAssets(dir, name string) error {
         children, err := AssetDir(name)
-        if err != nil { // File
+        // File
+        if err != nil {
                 return RestoreAsset(dir, name)
-        } else { // Dir
-                for _, child := range children {
-                        err = RestoreAssets(dir, path.Join(name, child))
-                        if err != nil {
-                                return err
-                        }
+        }
+        // Dir
+        for _, child := range children {
+                err = RestoreAssets(dir, path.Join(name, child))
+                if err != nil {
+                        return err
                 }
         }
         return nil
diff --git a/testdata/out/nocompress-nomemcopy.go b/testdata/out/nocompress-nomemcopy.go
index 8b78ba5..bf4c087 100644
--- a/testdata/out/nocompress-nomemcopy.go
+++ b/testdata/out/nocompress-nomemcopy.go
@@ -278,14 +278,15 @@ func RestoreAsset(dir, name string) error {
 // RestoreAssets restores an asset under the given directory recursively
 func RestoreAssets(dir, name string) error {
         children, err := AssetDir(name)
-        if err != nil { // File
+        // File
+        if err != nil {
                 return RestoreAsset(dir, name)
-        } else { // Dir
-                for _, child := range children {
-                        err = RestoreAssets(dir, path.Join(name, child))
-                        if err != nil {
-                                return err
-                        }
+        }
+        // Dir
+        for _, child := range children {
+                err = RestoreAssets(dir, path.Join(name, child))
+                if err != nil {
+                        return err
                 }
         }
         return nil