shithub: hugo

Download patch

ref: e38e881248b7d20927eab0e56c85732e1acbc45e
parent: 0665a3951be6ffc2551ef6664856da4cfccd45fa
author: Cameron Moore <moorereason@gmail.com>
date: Tue Aug 28 11:51:44 EDT 2018 

hugolib: Simplify some code


--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -1440,9 +1440,7 @@
 					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) {
--- a/hugolib/page_test.go
+++ b/hugolib/page_test.go
@@ -580,10 +580,8 @@
 
 		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"
--- a/hugolib/pagemeta/page_frontmatter.go
+++ b/hugolib/pagemeta/page_frontmatter.go
@@ -199,19 +199,17 @@
 
 	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)
 			}
 		}
 	}
--- a/hugolib/site_output.go
+++ b/hugolib/site_output.go
@@ -70,7 +70,7 @@
 
 	outputs := cfg.GetStringMap("outputs")
 
-	if outputs == nil || len(outputs) == 0 {
+	if len(outputs) == 0 {
 		return outFormats, nil
 	}
 
-- 
⑨