diff options
author | Cameron Moore <moorereason@gmail.com> | 2018-08-28 15:51:44 -0500 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-08-30 22:31:29 +0200 |
commit | e38e881248b7d20927eab0e56c85732e1acbc45e (patch) | |
tree | 0e96ada9f10258ebbeca73861f1b8078562dbd83 | |
parent | 0665a3951be6ffc2551ef6664856da4cfccd45fa (diff) |
hugolib: Simplify some code
-rw-r--r-- | hugolib/page.go | 4 | ||||
-rw-r--r-- | hugolib/page_test.go | 6 | ||||
-rw-r--r-- | hugolib/pagemeta/page_frontmatter.go | 24 | ||||
-rw-r--r-- | hugolib/site_output.go | 2 |
4 files changed, 15 insertions, 21 deletions
diff --git a/hugolib/page.go b/hugolib/page.go index 629b90484..bb6dab8e0 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -1440,9 +1440,7 @@ func (p *Page) update(frontmatter map[string]interface{}) error { resources = append(resources, cast.ToStringMap(vvv)) } case []map[string]interface{}: - for _, vvv := range vv { - resources = append(resources, vvv) - } + resources = append(resources, vv...) case []interface{}: for _, vvv := range vv { switch vvvv := vvv.(type) { diff --git a/hugolib/page_test.go b/hugolib/page_test.go index adf4294fc..ee6e73a4d 100644 --- a/hugolib/page_test.go +++ b/hugolib/page_test.go @@ -580,10 +580,8 @@ func testAllMarkdownEnginesForPages(t *testing.T, cfg, fs := newTestCfg() - if settings != nil { - for k, v := range settings { - cfg.Set(k, v) - } + for k, v := range settings { + cfg.Set(k, v) } contentDir := "content" diff --git a/hugolib/pagemeta/page_frontmatter.go b/hugolib/pagemeta/page_frontmatter.go index 8bfc4e837..c1139bd90 100644 --- a/hugolib/pagemeta/page_frontmatter.go +++ b/hugolib/pagemeta/page_frontmatter.go @@ -199,19 +199,17 @@ func newFrontmatterConfig(cfg config.Provider) (frontmatterConfig, error) { if cfg.IsSet("frontmatter") { fm := cfg.GetStringMap("frontmatter") - if fm != nil { - for k, v := range fm { - loki := strings.ToLower(k) - switch loki { - case fmDate: - c.date = toLowerSlice(v) - case fmPubDate: - c.publishDate = toLowerSlice(v) - case fmLastmod: - c.lastmod = toLowerSlice(v) - case fmExpiryDate: - c.expiryDate = toLowerSlice(v) - } + for k, v := range fm { + loki := strings.ToLower(k) + switch loki { + case fmDate: + c.date = toLowerSlice(v) + case fmPubDate: + c.publishDate = toLowerSlice(v) + case fmLastmod: + c.lastmod = toLowerSlice(v) + case fmExpiryDate: + c.expiryDate = toLowerSlice(v) } } } diff --git a/hugolib/site_output.go b/hugolib/site_output.go index 497092e8c..f81162e43 100644 --- a/hugolib/site_output.go +++ b/hugolib/site_output.go @@ -70,7 +70,7 @@ func createSiteOutputFormats(allFormats output.Formats, cfg config.Provider) (ma outputs := cfg.GetStringMap("outputs") - if outputs == nil || len(outputs) == 0 { + if len(outputs) == 0 { return outFormats, nil } |