From d90e37e0c6e812f9913bf256c9c81aa05b7a08aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Wed, 2 Dec 2020 13:23:25 +0100
Subject: all: Format code with gofumpt

See https://github.com/mvdan/gofumpt
---
 cache/filecache/filecache.go             | 5 -----
 cache/filecache/filecache_config_test.go | 3 ---
 cache/filecache/filecache_pruner.go      | 2 --
 cache/filecache/filecache_pruner_test.go | 1 -
 cache/filecache/filecache_test.go        | 3 ---
 cache/namedmemcache/named_cache.go       | 1 -
 6 files changed, 15 deletions(-)

(limited to 'cache')

diff --git a/cache/filecache/filecache.go b/cache/filecache/filecache.go
index 37870dd5f..c586f9a51 100644
--- a/cache/filecache/filecache.go
+++ b/cache/filecache/filecache.go
@@ -158,7 +158,6 @@ func (c *Cache) ReadOrCreate(id string,
 	err = create(info, f)
 
 	return
-
 }
 
 // GetOrCreate tries to get the file with the given id from cache. If not found or expired, create will
@@ -220,7 +219,6 @@ func (c *Cache) GetOrCreateBytes(id string, create func() ([]byte, error)) (Item
 		return info, nil, err
 	}
 	return info, b, nil
-
 }
 
 // GetBytes gets the file content with the given id from the cahce, nil if none found.
@@ -276,7 +274,6 @@ func (c *Cache) getOrRemove(id string) hugio.ReadSeekCloser {
 	}
 
 	f, err := c.Fs.Open(id)
-
 	if err != nil {
 		return nil
 	}
@@ -299,7 +296,6 @@ func (c *Cache) getString(id string) string {
 	defer c.nlocker.Unlock(id)
 
 	f, err := c.Fs.Open(id)
-
 	if err != nil {
 		return ""
 	}
@@ -307,7 +303,6 @@ func (c *Cache) getString(id string) string {
 
 	b, _ := ioutil.ReadAll(f)
 	return string(b)
-
 }
 
 // Caches is a named set of caches.
diff --git a/cache/filecache/filecache_config_test.go b/cache/filecache/filecache_config_test.go
index 9f80a4f90..cd1d2c82a 100644
--- a/cache/filecache/filecache_config_test.go
+++ b/cache/filecache/filecache_config_test.go
@@ -69,7 +69,6 @@ dir = "/path/to/c3"
 	c3 := decoded["images"]
 	c.Assert(c3.MaxAge, qt.Equals, time.Duration(-1))
 	c.Assert(c3.Dir, qt.Equals, filepath.FromSlash("/path/to/c3/filecache/images"))
-
 }
 
 func TestDecodeConfigIgnoreCache(t *testing.T) {
@@ -110,7 +109,6 @@ dir = "/path/to/c3"
 	for _, v := range decoded {
 		c.Assert(v.MaxAge, qt.Equals, time.Duration(0))
 	}
-
 }
 
 func TestDecodeConfigDefault(t *testing.T) {
@@ -178,7 +176,6 @@ dir = "/"
 
 	_, err = DecodeConfig(fs, cfg)
 	c.Assert(err, qt.Not(qt.IsNil))
-
 }
 
 func newTestConfig() *viper.Viper {
diff --git a/cache/filecache/filecache_pruner.go b/cache/filecache/filecache_pruner.go
index b77f5331b..db1875701 100644
--- a/cache/filecache/filecache_pruner.go
+++ b/cache/filecache/filecache_pruner.go
@@ -110,7 +110,6 @@ func (c *Cache) Prune(force bool) (int, error) {
 }
 
 func (c *Cache) pruneRootDir(force bool) (int, error) {
-
 	info, err := c.Fs.Stat(c.pruneAllRootDir)
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -124,5 +123,4 @@ func (c *Cache) pruneRootDir(force bool) (int, error) {
 	}
 
 	return hugofs.MakeReadableAndRemoveAllModulePkgDir(c.Fs, c.pruneAllRootDir)
-
 }
diff --git a/cache/filecache/filecache_pruner_test.go b/cache/filecache/filecache_pruner_test.go
index 48bce723e..46e1317ce 100644
--- a/cache/filecache/filecache_pruner_test.go
+++ b/cache/filecache/filecache_pruner_test.go
@@ -107,5 +107,4 @@ dir = ":resourceDir/_gen"
 		}
 
 	}
-
 }
diff --git a/cache/filecache/filecache_test.go b/cache/filecache/filecache_test.go
index 00b4e5573..6a051a264 100644
--- a/cache/filecache/filecache_test.go
+++ b/cache/filecache/filecache_test.go
@@ -183,7 +183,6 @@ dir = ":cacheDir/c"
 		c.Assert(string(b), qt.Equals, "Hugo is great!")
 
 	}
-
 }
 
 func TestFileCacheConcurrent(t *testing.T) {
@@ -253,7 +252,6 @@ func TestFileCacheReadOrCreateErrorInRead(t *testing.T) {
 	var result string
 
 	rf := func(failLevel int) func(info ItemInfo, r io.ReadSeeker) error {
-
 		return func(info ItemInfo, r io.ReadSeeker) error {
 			if failLevel > 0 {
 				if failLevel > 1 {
@@ -347,5 +345,4 @@ func newPathsSpec(t *testing.T, fs afero.Fs, configStr string) *helpers.PathSpec
 	p, err := helpers.NewPathSpec(hugofs.NewFrom(fs, cfg), cfg, nil)
 	c.Assert(err, qt.IsNil)
 	return p
-
 }
diff --git a/cache/namedmemcache/named_cache.go b/cache/namedmemcache/named_cache.go
index d8c229a01..d67bcc28a 100644
--- a/cache/namedmemcache/named_cache.go
+++ b/cache/namedmemcache/named_cache.go
@@ -49,7 +49,6 @@ func (c *Cache) Clear() {
 
 	c.cache = make(map[string]cacheEntry)
 	c.nlocker = locker.NewLocker()
-
 }
 
 // GetOrCreate tries to get the value with the given cache key, if not found
-- 
cgit v1.2.3