summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2024-01-28 22:34:10 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2024-01-28 23:14:09 +0100
commita795acbcd8b18aa4af384d5c03f30740361c8fcf (patch)
tree0dbf7b000681a738b892c5235daf52c63cda88b9 /common
parent982d9513e71b3d48e20cfa38454a0e1215a8d963 (diff)
all: Run gofumpt -l -w .
Diffstat (limited to 'common')
-rw-r--r--common/collections/append_test.go12
-rw-r--r--common/collections/slice.go1
-rw-r--r--common/collections/slice_test.go1
-rw-r--r--common/hexec/exec.go6
-rw-r--r--common/htime/time_test.go4
-rw-r--r--common/maps/maps_test.go1
-rw-r--r--common/maps/params_test.go1
-rw-r--r--common/paths/url.go1
-rw-r--r--common/text/transform_test.go4
-rw-r--r--common/types/convert.go1
-rw-r--r--common/types/convert_test.go1
11 files changed, 9 insertions, 24 deletions
diff --git a/common/collections/append_test.go b/common/collections/append_test.go
index 3c2aab2db..f791b731a 100644
--- a/common/collections/append_test.go
+++ b/common/collections/append_test.go
@@ -55,7 +55,7 @@ func TestAppend(t *testing.T) {
[]any{&tstSlicerIn1{"c"}},
testSlicerInterfaces{&tstSlicerIn1{"a"}, &tstSlicerIn1{"b"}, &tstSlicerIn1{"c"}},
},
- //https://github.com/gohugoio/hugo/issues/5361
+ // https://github.com/gohugoio/hugo/issues/5361
{
[]string{"a", "b"},
[]any{tstSlicers{&tstSlicer{"a"}, &tstSlicer{"b"}}},
@@ -102,14 +102,16 @@ func TestAppendToMultiDimensionalSlice(t *testing.T) {
from []any
expected any
}{
- {[][]string{{"a", "b"}},
+ {
+ [][]string{{"a", "b"}},
[]any{[]string{"c", "d"}},
[][]string{
{"a", "b"},
{"c", "d"},
},
},
- {[][]string{{"a", "b"}},
+ {
+ [][]string{{"a", "b"}},
[]any{[]string{"c", "d"}, []string{"e", "f"}},
[][]string{
{"a", "b"},
@@ -117,7 +119,8 @@ func TestAppendToMultiDimensionalSlice(t *testing.T) {
{"e", "f"},
},
},
- {[][]string{{"a", "b"}},
+ {
+ [][]string{{"a", "b"}},
[]any{[]int{1, 2}},
false,
},
@@ -130,7 +133,6 @@ func TestAppendToMultiDimensionalSlice(t *testing.T) {
c.Assert(result, qt.DeepEquals, test.expected)
}
}
-
}
func TestAppendShouldMakeACopyOfTheInputSlice(t *testing.T) {
diff --git a/common/collections/slice.go b/common/collections/slice.go
index bf5c7b52b..731f489f9 100644
--- a/common/collections/slice.go
+++ b/common/collections/slice.go
@@ -73,7 +73,6 @@ func StringSliceToInterfaceSlice(ss []string) []any {
result[i] = s
}
return result
-
}
type SortedStringSlice []string
diff --git a/common/collections/slice_test.go b/common/collections/slice_test.go
index 5788b9161..20961aac0 100644
--- a/common/collections/slice_test.go
+++ b/common/collections/slice_test.go
@@ -135,5 +135,4 @@ func TestSortedStringSlice(t *testing.T) {
c.Assert(s.Count("b"), qt.Equals, 3)
c.Assert(s.Count("z"), qt.Equals, 0)
c.Assert(s.Count("a"), qt.Equals, 1)
-
}
diff --git a/common/hexec/exec.go b/common/hexec/exec.go
index 95e5162fc..12775bd1c 100644
--- a/common/hexec/exec.go
+++ b/common/hexec/exec.go
@@ -19,11 +19,10 @@ import (
"errors"
"fmt"
"io"
- "regexp"
- "strings"
-
"os"
"os/exec"
+ "regexp"
+ "strings"
"github.com/cli/safeexec"
"github.com/gohugoio/hugo/config"
@@ -142,7 +141,6 @@ func (e *Exec) New(name string, arg ...any) (Runner, error) {
}
return cm.command(arg...)
-
}
// Npx is a convenience method to create a Runner running npx --no-install <name> <args.
diff --git a/common/htime/time_test.go b/common/htime/time_test.go
index 6cb323409..78954887e 100644
--- a/common/htime/time_test.go
+++ b/common/htime/time_test.go
@@ -53,7 +53,6 @@ func TestTimeFormatter(t *testing.T) {
c.Assert(f.Format(june06, ":time_long"), qt.Equals, "02:09:37 UTC")
c.Assert(f.Format(june06, ":time_medium"), qt.Equals, "02:09:37")
c.Assert(f.Format(june06, ":time_short"), qt.Equals, "02:09")
-
})
c.Run("Custom layouts English", func(c *qt.C) {
@@ -68,7 +67,6 @@ func TestTimeFormatter(t *testing.T) {
c.Assert(f.Format(june06, ":time_long"), qt.Equals, "2:09:37 am UTC")
c.Assert(f.Format(june06, ":time_medium"), qt.Equals, "2:09:37 am")
c.Assert(f.Format(june06, ":time_short"), qt.Equals, "2:09 am")
-
})
c.Run("English", func(c *qt.C) {
@@ -107,9 +105,7 @@ func TestTimeFormatter(t *testing.T) {
c.Assert(tr.MonthWide(date.Month()), qt.Equals, monthWideNorway)
c.Assert(f.Format(date, "January"), qt.Equals, monthWideNorway)
}
-
})
-
}
func BenchmarkTimeFormatter(b *testing.B) {
diff --git a/common/maps/maps_test.go b/common/maps/maps_test.go
index 0e8589d34..098098388 100644
--- a/common/maps/maps_test.go
+++ b/common/maps/maps_test.go
@@ -192,5 +192,4 @@ func TestLookupEqualFold(t *testing.T) {
v, found = LookupEqualFold(m2, "b")
c.Assert(found, qt.IsTrue)
c.Assert(v, qt.Equals, "bv")
-
}
diff --git a/common/maps/params_test.go b/common/maps/params_test.go
index 578b2a576..892c77175 100644
--- a/common/maps/params_test.go
+++ b/common/maps/params_test.go
@@ -154,7 +154,6 @@ func TestParamsSetAndMerge(t *testing.T) {
"a": "av",
"c": "cv",
})
-
}
func TestParamsIsZero(t *testing.T) {
diff --git a/common/paths/url.go b/common/paths/url.go
index 4c4a7f2dc..75b4b644a 100644
--- a/common/paths/url.go
+++ b/common/paths/url.go
@@ -163,7 +163,6 @@ func Uglify(in string) string {
// If ParseRequestURI fails, the input is just converted to OS specific slashes and returned.
func UrlToFilename(s string) (string, bool) {
u, err := url.ParseRequestURI(s)
-
if err != nil {
return filepath.FromSlash(s), false
}
diff --git a/common/text/transform_test.go b/common/text/transform_test.go
index 41447715f..74bb37783 100644
--- a/common/text/transform_test.go
+++ b/common/text/transform_test.go
@@ -57,7 +57,6 @@ line 3`
c := qt.New(t)
c.Assert(collected, qt.DeepEquals, []string{"line 1\n", "line 2\n", "\n", "line 3"})
-
}
func BenchmarkVisitLinesAfter(b *testing.B) {
@@ -68,9 +67,6 @@ func BenchmarkVisitLinesAfter(b *testing.B) {
for i := 0; i < b.N; i++ {
VisitLinesAfter(lines, func(s string) {
-
})
-
}
-
}
diff --git a/common/types/convert.go b/common/types/convert.go
index fbeab5b91..0cb5035df 100644
--- a/common/types/convert.go
+++ b/common/types/convert.go
@@ -80,7 +80,6 @@ func ToStringSlicePreserveStringE(v any) ([]string, error) {
default:
return nil, fmt.Errorf("failed to convert %T to a string slice", v)
}
-
}
// TypeToString converts v to a string if it's a valid string type.
diff --git a/common/types/convert_test.go b/common/types/convert_test.go
index 215117441..13059285d 100644
--- a/common/types/convert_test.go
+++ b/common/types/convert_test.go
@@ -45,5 +45,4 @@ func TestToDuration(t *testing.T) {
c.Assert(ToDuration("200"), qt.Equals, 200*time.Millisecond)
c.Assert(ToDuration("4m"), qt.Equals, 4*time.Minute)
c.Assert(ToDuration("asdfadf"), qt.Equals, time.Duration(0))
-
}