From 873a6f18851bcda79d562ff6c02e1109e8e31a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Tue, 13 Jun 2017 19:07:35 +0200 Subject: [PATCH] Run gofmt to get imports in line vs gohugoio/hugo --- commands/convert.go | 4 ++-- commands/gendoc.go | 4 ++-- commands/gendocshelper.go | 2 +- commands/genman.go | 4 ++-- commands/hugo.go | 6 +++--- commands/import_jekyll.go | 6 +++--- commands/list.go | 2 +- commands/new.go | 4 ++-- commands/release.go | 2 +- commands/server.go | 4 ++-- commands/undraft.go | 2 +- commands/version.go | 4 ++-- create/content.go | 4 ++-- create/content_test.go | 2 +- helpers/content.go | 4 ++-- helpers/content_renderer.go | 2 +- helpers/emoji_test.go | 2 +- helpers/general.go | 2 +- helpers/language.go | 2 +- helpers/path_test.go | 2 +- hugofs/fs.go | 2 +- hugolib/case_insensitive_test.go | 2 +- hugolib/config.go | 2 +- hugolib/disableKinds_test.go | 2 +- hugolib/hugo_sites_build_test.go | 2 +- hugolib/multilingual.go | 2 +- hugolib/page.go | 4 ++-- hugolib/page_test.go | 2 +- hugolib/site.go | 4 ++-- hugolib/site_output.go | 2 +- hugolib/site_sections.go | 2 +- hugolib/testhelpers_test.go | 2 +- i18n/i18n.go | 2 +- i18n/i18n_test.go | 2 +- i18n/translationProvider.go | 2 +- source/filesystem.go | 2 +- tpl/collections/collections.go | 2 +- tpl/collections/sort.go | 2 +- tpl/data/cache.go | 2 +- tpl/data/resources.go | 2 +- tpl/data/resources_test.go | 2 +- tpl/images/images.go | 2 +- tpl/images/images_test.go | 4 ++-- tpl/lang/lang.go | 2 +- tpl/os/os.go | 2 +- tpl/os/os_test.go | 2 +- tpl/safe/safe.go | 2 +- tpl/strings/strings.go | 2 +- tpl/tplimpl/template.go | 2 +- tpl/tplimpl/template_funcs_test.go | 2 +- tpl/transform/transform.go | 2 +- tpl/urls/urls.go | 2 +- 52 files changed, 67 insertions(+), 67 deletions(-) diff --git a/commands/convert.go b/commands/convert.go index e40f5fa40..298ff6019 100644 --- a/commands/convert.go +++ b/commands/convert.go @@ -19,10 +19,10 @@ import ( "path/filepath" "time" - "github.com/spf13/cast" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/parser" + "github.com/spf13/cast" + "github.com/spf13/cobra" ) var outputDir string diff --git a/commands/gendoc.go b/commands/gendoc.go index 70e87dd6f..c4840050b 100644 --- a/commands/gendoc.go +++ b/commands/gendoc.go @@ -20,10 +20,10 @@ import ( "strings" "time" - "github.com/spf13/cobra" - "github.com/spf13/cobra/doc" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" + "github.com/spf13/cobra" + "github.com/spf13/cobra/doc" jww "github.com/spf13/jwalterweatherman" ) diff --git a/commands/gendocshelper.go b/commands/gendocshelper.go index 1d83232ec..ca781242e 100644 --- a/commands/gendocshelper.go +++ b/commands/gendocshelper.go @@ -19,8 +19,8 @@ import ( "os" "path/filepath" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/docshelper" + "github.com/spf13/cobra" ) type genDocsHelper struct { diff --git a/commands/genman.go b/commands/genman.go index dd85a6e6a..004e669e7 100644 --- a/commands/genman.go +++ b/commands/genman.go @@ -17,10 +17,10 @@ import ( "fmt" "strings" - "github.com/spf13/cobra" - "github.com/spf13/cobra/doc" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" + "github.com/spf13/cobra" + "github.com/spf13/cobra/doc" jww "github.com/spf13/jwalterweatherman" ) diff --git a/commands/hugo.go b/commands/hugo.go index 918e76474..b965ba167 100644 --- a/commands/hugo.go +++ b/commands/hugo.go @@ -38,15 +38,15 @@ import ( "regexp" "github.com/fsnotify/fsnotify" - "github.com/spf13/afero" - "github.com/spf13/cobra" - "github.com/spf13/fsync" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/livereload" "github.com/gohugoio/hugo/utils" "github.com/gohugoio/hugo/watcher" + "github.com/spf13/afero" + "github.com/spf13/cobra" + "github.com/spf13/fsync" jww "github.com/spf13/jwalterweatherman" "github.com/spf13/nitro" "github.com/spf13/viper" diff --git a/commands/import_jekyll.go b/commands/import_jekyll.go index 37f06bb2f..26a41c82a 100644 --- a/commands/import_jekyll.go +++ b/commands/import_jekyll.go @@ -25,13 +25,13 @@ import ( "strings" "time" - "github.com/spf13/afero" - "github.com/spf13/cast" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" "github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/parser" + "github.com/spf13/afero" + "github.com/spf13/cast" + "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" ) diff --git a/commands/list.go b/commands/list.go index 4f3319c57..b2a6b5395 100644 --- a/commands/list.go +++ b/commands/list.go @@ -16,8 +16,8 @@ package commands import ( "path/filepath" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/hugolib" + "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" ) diff --git a/commands/new.go b/commands/new.go index 5b48abaf1..24f34b549 100644 --- a/commands/new.go +++ b/commands/new.go @@ -22,13 +22,13 @@ import ( "strings" "time" - "github.com/spf13/afero" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/create" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" "github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/parser" + "github.com/spf13/afero" + "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" "github.com/spf13/viper" ) diff --git a/commands/release.go b/commands/release.go index c306b2c2b..c9275a0f0 100644 --- a/commands/release.go +++ b/commands/release.go @@ -16,8 +16,8 @@ package commands import ( - "github.com/spf13/cobra" "github.com/gohugoio/hugo/releaser" + "github.com/spf13/cobra" ) func init() { diff --git a/commands/server.go b/commands/server.go index 0c16b959f..32a94f9c8 100644 --- a/commands/server.go +++ b/commands/server.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/spf13/afero" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/afero" + "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" ) diff --git a/commands/undraft.go b/commands/undraft.go index ae17ab34d..2a3b85360 100644 --- a/commands/undraft.go +++ b/commands/undraft.go @@ -19,8 +19,8 @@ import ( "os" "time" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/parser" + "github.com/spf13/cobra" ) var undraftCmd = &cobra.Command{ diff --git a/commands/version.go b/commands/version.go index a05967d21..5cd398b2b 100644 --- a/commands/version.go +++ b/commands/version.go @@ -20,10 +20,10 @@ import ( "strings" "time" - "github.com/kardianos/osext" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugolib" + "github.com/kardianos/osext" + "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" ) diff --git a/create/content.go b/create/content.go index 29c99d471..a62227176 100644 --- a/create/content.go +++ b/create/content.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "github.com/spf13/afero" - "github.com/spf13/cast" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/parser" + "github.com/spf13/afero" + "github.com/spf13/cast" jww "github.com/spf13/jwalterweatherman" ) diff --git a/create/content_test.go b/create/content_test.go index 9728c1c96..8eaaf7bf5 100644 --- a/create/content_test.go +++ b/create/content_test.go @@ -27,9 +27,9 @@ import ( "github.com/gohugoio/hugo/hugofs" - "github.com/spf13/afero" "github.com/gohugoio/hugo/create" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/afero" "github.com/spf13/viper" "github.com/stretchr/testify/require" ) diff --git a/helpers/content.go b/helpers/content.go index afd8c7c37..bb547de25 100644 --- a/helpers/content.go +++ b/helpers/content.go @@ -26,11 +26,11 @@ import ( "unicode/utf8" "github.com/chaseadamsio/goorgeous" + bp "github.com/gohugoio/hugo/bufferpool" + "github.com/gohugoio/hugo/config" "github.com/miekg/mmark" "github.com/mitchellh/mapstructure" "github.com/russross/blackfriday" - bp "github.com/gohugoio/hugo/bufferpool" - "github.com/gohugoio/hugo/config" jww "github.com/spf13/jwalterweatherman" "strings" diff --git a/helpers/content_renderer.go b/helpers/content_renderer.go index 49f11bc84..f0d8cda12 100644 --- a/helpers/content_renderer.go +++ b/helpers/content_renderer.go @@ -17,9 +17,9 @@ import ( "bytes" "html" + "github.com/gohugoio/hugo/config" "github.com/miekg/mmark" "github.com/russross/blackfriday" - "github.com/gohugoio/hugo/config" jww "github.com/spf13/jwalterweatherman" ) diff --git a/helpers/emoji_test.go b/helpers/emoji_test.go index 311ff644f..f9189eb43 100644 --- a/helpers/emoji_test.go +++ b/helpers/emoji_test.go @@ -18,8 +18,8 @@ import ( "strings" "testing" - "github.com/kyokomi/emoji" "github.com/gohugoio/hugo/bufferpool" + "github.com/kyokomi/emoji" ) func TestEmojiCustom(t *testing.T) { diff --git a/helpers/general.go b/helpers/general.go index d3dedc774..7901be654 100644 --- a/helpers/general.go +++ b/helpers/general.go @@ -26,8 +26,8 @@ import ( "unicode" "unicode/utf8" - "github.com/spf13/cast" bp "github.com/gohugoio/hugo/bufferpool" + "github.com/spf13/cast" jww "github.com/spf13/jwalterweatherman" "github.com/spf13/pflag" ) diff --git a/helpers/language.go b/helpers/language.go index ba2eeb8f6..67db59d25 100644 --- a/helpers/language.go +++ b/helpers/language.go @@ -18,8 +18,8 @@ import ( "strings" "sync" - "github.com/spf13/cast" "github.com/gohugoio/hugo/config" + "github.com/spf13/cast" ) // These are the settings that should only be looked up in the global Viper diff --git a/helpers/path_test.go b/helpers/path_test.go index b2e5f65a3..5c0ae10ea 100644 --- a/helpers/path_test.go +++ b/helpers/path_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/spf13/afero" "github.com/gohugoio/hugo/hugofs" + "github.com/spf13/afero" "github.com/spf13/viper" ) diff --git a/hugofs/fs.go b/hugofs/fs.go index 92e89d4cc..71c0dade0 100644 --- a/hugofs/fs.go +++ b/hugofs/fs.go @@ -15,8 +15,8 @@ package hugofs import ( - "github.com/spf13/afero" "github.com/gohugoio/hugo/config" + "github.com/spf13/afero" ) // Os points to an Os Afero file system. diff --git a/hugolib/case_insensitive_test.go b/hugolib/case_insensitive_test.go index d065a6923..ca63196b3 100644 --- a/hugolib/case_insensitive_test.go +++ b/hugolib/case_insensitive_test.go @@ -19,9 +19,9 @@ import ( "strings" "testing" - "github.com/spf13/afero" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/hugofs" + "github.com/spf13/afero" "github.com/stretchr/testify/require" ) diff --git a/hugolib/config.go b/hugolib/config.go index 80b7bff39..62cdea952 100644 --- a/hugolib/config.go +++ b/hugolib/config.go @@ -16,8 +16,8 @@ package hugolib import ( "fmt" - "github.com/spf13/afero" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/afero" "github.com/spf13/viper" ) diff --git a/hugolib/disableKinds_test.go b/hugolib/disableKinds_test.go index 81f277c72..736d461db 100644 --- a/hugolib/disableKinds_test.go +++ b/hugolib/disableKinds_test.go @@ -18,8 +18,8 @@ import ( "fmt" - "github.com/spf13/afero" "github.com/gohugoio/hugo/deps" + "github.com/spf13/afero" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go index 06867ab3d..988a36916 100644 --- a/hugolib/hugo_sites_build_test.go +++ b/hugolib/hugo_sites_build_test.go @@ -13,11 +13,11 @@ import ( "github.com/fortytw2/leaktest" "github.com/fsnotify/fsnotify" - "github.com/spf13/afero" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" "github.com/gohugoio/hugo/source" + "github.com/spf13/afero" "github.com/spf13/viper" "github.com/stretchr/testify/require" ) diff --git a/hugolib/multilingual.go b/hugolib/multilingual.go index 04efe6386..575be1396 100644 --- a/hugolib/multilingual.go +++ b/hugolib/multilingual.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" - "github.com/spf13/cast" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/cast" ) type Multilingual struct { diff --git a/hugolib/page.go b/hugolib/page.go index a0ea7183c..d4aca37a4 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -21,10 +21,10 @@ import ( "github.com/bep/gitmap" - "github.com/mitchellh/mapstructure" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/output" "github.com/gohugoio/hugo/parser" + "github.com/mitchellh/mapstructure" "html/template" "io" @@ -36,9 +36,9 @@ import ( "time" "unicode/utf8" - "github.com/spf13/cast" bp "github.com/gohugoio/hugo/bufferpool" "github.com/gohugoio/hugo/source" + "github.com/spf13/cast" ) var ( diff --git a/hugolib/page_test.go b/hugolib/page_test.go index dbb7e38ee..352c7dd41 100644 --- a/hugolib/page_test.go +++ b/hugolib/page_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/spf13/cast" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/cast" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/hugolib/site.go b/hugolib/site.go index 78f02ff80..829023d15 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -37,8 +37,6 @@ import ( "sync/atomic" "github.com/fsnotify/fsnotify" - "github.com/spf13/afero" - "github.com/spf13/cast" bp "github.com/gohugoio/hugo/bufferpool" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" @@ -47,6 +45,8 @@ import ( "github.com/gohugoio/hugo/source" "github.com/gohugoio/hugo/tpl" "github.com/gohugoio/hugo/transform" + "github.com/spf13/afero" + "github.com/spf13/cast" "github.com/spf13/nitro" "github.com/spf13/viper" ) diff --git a/hugolib/site_output.go b/hugolib/site_output.go index cbd85f35b..f5eb2ba57 100644 --- a/hugolib/site_output.go +++ b/hugolib/site_output.go @@ -18,10 +18,10 @@ import ( "path" "strings" - "github.com/spf13/cast" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/output" + "github.com/spf13/cast" ) func createSiteOutputFormats(allFormats output.Formats, cfg config.Provider) (map[string]output.Formats, error) { diff --git a/hugolib/site_sections.go b/hugolib/site_sections.go index 0e4370118..f8d9c9d1f 100644 --- a/hugolib/site_sections.go +++ b/hugolib/site_sections.go @@ -19,8 +19,8 @@ import ( "strconv" "strings" - radix "github.com/hashicorp/go-immutable-radix" "github.com/gohugoio/hugo/helpers" + radix "github.com/hashicorp/go-immutable-radix" ) // Deprecated: Use .Site.Home.Sections. diff --git a/hugolib/testhelpers_test.go b/hugolib/testhelpers_test.go index 6439efb09..c386e6203 100644 --- a/hugolib/testhelpers_test.go +++ b/hugolib/testhelpers_test.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "github.com/spf13/afero" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/deps" + "github.com/spf13/afero" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/source" diff --git a/i18n/i18n.go b/i18n/i18n.go index c7f8b5827..73417fb32 100644 --- a/i18n/i18n.go +++ b/i18n/i18n.go @@ -14,9 +14,9 @@ package i18n import ( - "github.com/nicksnyder/go-i18n/i18n/bundle" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/helpers" + "github.com/nicksnyder/go-i18n/i18n/bundle" jww "github.com/spf13/jwalterweatherman" ) diff --git a/i18n/i18n_test.go b/i18n/i18n_test.go index 496d35ad3..6a9d362b0 100644 --- a/i18n/i18n_test.go +++ b/i18n/i18n_test.go @@ -21,8 +21,8 @@ import ( "log" - "github.com/nicksnyder/go-i18n/i18n/bundle" "github.com/gohugoio/hugo/config" + "github.com/nicksnyder/go-i18n/i18n/bundle" jww "github.com/spf13/jwalterweatherman" "github.com/spf13/viper" "github.com/stretchr/testify/require" diff --git a/i18n/translationProvider.go b/i18n/translationProvider.go index c0d39c4a2..9947d3ce5 100644 --- a/i18n/translationProvider.go +++ b/i18n/translationProvider.go @@ -16,9 +16,9 @@ package i18n import ( "fmt" - "github.com/nicksnyder/go-i18n/i18n/bundle" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/source" + "github.com/nicksnyder/go-i18n/i18n/bundle" ) // TranslationProvider provides translation handling, i.e. loading diff --git a/source/filesystem.go b/source/filesystem.go index e36b02124..446d8c06d 100644 --- a/source/filesystem.go +++ b/source/filesystem.go @@ -21,8 +21,8 @@ import ( "runtime" "strings" - "github.com/spf13/cast" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/cast" jww "github.com/spf13/jwalterweatherman" "golang.org/x/text/unicode/norm" ) diff --git a/tpl/collections/collections.go b/tpl/collections/collections.go index 2a29062d7..ae2d73b46 100644 --- a/tpl/collections/collections.go +++ b/tpl/collections/collections.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/spf13/cast" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/cast" ) // New returns a new instance of the collections-namespaced template functions. diff --git a/tpl/collections/sort.go b/tpl/collections/sort.go index 36faf207e..206a19cb5 100644 --- a/tpl/collections/sort.go +++ b/tpl/collections/sort.go @@ -19,8 +19,8 @@ import ( "sort" "strings" - "github.com/spf13/cast" "github.com/gohugoio/hugo/tpl/compare" + "github.com/spf13/cast" ) var comp = compare.New() diff --git a/tpl/data/cache.go b/tpl/data/cache.go index a9b0f0138..b4f91c0f8 100644 --- a/tpl/data/cache.go +++ b/tpl/data/cache.go @@ -18,9 +18,9 @@ import ( "net/url" "sync" - "github.com/spf13/afero" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/afero" ) var cacheMu sync.RWMutex diff --git a/tpl/data/resources.go b/tpl/data/resources.go index bc9d4b7c4..11c35f9d9 100644 --- a/tpl/data/resources.go +++ b/tpl/data/resources.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "github.com/spf13/afero" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/afero" jww "github.com/spf13/jwalterweatherman" ) diff --git a/tpl/data/resources_test.go b/tpl/data/resources_test.go index 31e782362..de83f771d 100644 --- a/tpl/data/resources_test.go +++ b/tpl/data/resources_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/spf13/afero" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" + "github.com/spf13/afero" "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tpl/images/images.go b/tpl/images/images.go index 69bc77a34..f98c24286 100644 --- a/tpl/images/images.go +++ b/tpl/images/images.go @@ -23,8 +23,8 @@ import ( _ "image/jpeg" _ "image/png" - "github.com/spf13/cast" "github.com/gohugoio/hugo/deps" + "github.com/spf13/cast" ) // New returns a new instance of the images-namespaced template functions. diff --git a/tpl/images/images_test.go b/tpl/images/images_test.go index 6fa93b106..c9b78ea9a 100644 --- a/tpl/images/images_test.go +++ b/tpl/images/images_test.go @@ -22,10 +22,10 @@ import ( "path/filepath" "testing" - "github.com/spf13/afero" - "github.com/spf13/cast" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/hugofs" + "github.com/spf13/afero" + "github.com/spf13/cast" "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tpl/lang/lang.go b/tpl/lang/lang.go index 0442e4dec..3a659b119 100644 --- a/tpl/lang/lang.go +++ b/tpl/lang/lang.go @@ -19,8 +19,8 @@ import ( "strconv" "strings" - "github.com/spf13/cast" "github.com/gohugoio/hugo/deps" + "github.com/spf13/cast" ) // New returns a new instance of the lang-namespaced template functions. diff --git a/tpl/os/os.go b/tpl/os/os.go index 4addae5a6..fb60f87dd 100644 --- a/tpl/os/os.go +++ b/tpl/os/os.go @@ -18,9 +18,9 @@ import ( "fmt" _os "os" + "github.com/gohugoio/hugo/deps" "github.com/spf13/afero" "github.com/spf13/cast" - "github.com/gohugoio/hugo/deps" ) // New returns a new instance of the os-namespaced template functions. diff --git a/tpl/os/os_test.go b/tpl/os/os_test.go index 772fcb76a..383eb88c4 100644 --- a/tpl/os/os_test.go +++ b/tpl/os/os_test.go @@ -18,9 +18,9 @@ import ( "path/filepath" "testing" - "github.com/spf13/afero" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/hugofs" + "github.com/spf13/afero" "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tpl/safe/safe.go b/tpl/safe/safe.go index 49db9dd82..64c36cc4d 100644 --- a/tpl/safe/safe.go +++ b/tpl/safe/safe.go @@ -16,8 +16,8 @@ package safe import ( "html/template" - "github.com/spf13/cast" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/cast" ) // New returns a new instance of the safe-namespaced template functions. diff --git a/tpl/strings/strings.go b/tpl/strings/strings.go index 36af1a1c5..ec95be730 100644 --- a/tpl/strings/strings.go +++ b/tpl/strings/strings.go @@ -20,9 +20,9 @@ import ( _strings "strings" "unicode/utf8" - "github.com/spf13/cast" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/cast" ) // New returns a new instance of the strings-namespaced template functions. diff --git a/tpl/tplimpl/template.go b/tpl/tplimpl/template.go index 13be7ee6d..06ab775c3 100644 --- a/tpl/tplimpl/template.go +++ b/tpl/tplimpl/template.go @@ -29,10 +29,10 @@ import ( "path/filepath" "sync" - "github.com/spf13/afero" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/tpl" + "github.com/spf13/afero" ) const ( diff --git a/tpl/tplimpl/template_funcs_test.go b/tpl/tplimpl/template_funcs_test.go index 038a204e3..04f4464ec 100644 --- a/tpl/tplimpl/template_funcs_test.go +++ b/tpl/tplimpl/template_funcs_test.go @@ -24,7 +24,6 @@ import ( "log" "os" - "github.com/spf13/afero" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" @@ -32,6 +31,7 @@ import ( "github.com/gohugoio/hugo/i18n" "github.com/gohugoio/hugo/tpl" "github.com/gohugoio/hugo/tpl/internal" + "github.com/spf13/afero" jww "github.com/spf13/jwalterweatherman" "github.com/spf13/viper" "github.com/stretchr/testify/require" diff --git a/tpl/transform/transform.go b/tpl/transform/transform.go index 2cc4295b2..b41b41b9c 100644 --- a/tpl/transform/transform.go +++ b/tpl/transform/transform.go @@ -18,9 +18,9 @@ import ( "html" "html/template" - "github.com/spf13/cast" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/cast" ) // New returns a new instance of the transform-namespaced template functions. diff --git a/tpl/urls/urls.go b/tpl/urls/urls.go index 60078695f..e29cabe89 100644 --- a/tpl/urls/urls.go +++ b/tpl/urls/urls.go @@ -17,8 +17,8 @@ import ( "errors" "html/template" - "github.com/spf13/cast" "github.com/gohugoio/hugo/deps" + "github.com/spf13/cast" ) // New returns a new instance of the urls-namespaced template functions.