hugolib: Simplify

diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
index 31e499922fd77b2091ac3eef6046ab03f0c99d27..2794ad37dee2ebf815f35d9df54fcf0039188140 100644 (file)
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -167,12 +167,8 @@ func (h *HugoSites) renderCrossSitesArtifacts() error {
 
        smLayouts := []string{"sitemapindex.xml", "_default/sitemapindex.xml", "_internal/_default/sitemapindex.xml"}
 
-       if err := s.renderAndWriteXML("sitemapindex", sitemapDefault.Filename,
-               h.toSiteInfos(), s.appendThemeTemplates(smLayouts)...); err != nil {
-               return err
-       }
-
-       return nil
+       return s.renderAndWriteXML("sitemapindex",
+               sitemapDefault.Filename, h.toSiteInfos(), s.appendThemeTemplates(smLayouts)...)
 }
 
 func (h *HugoSites) assignMissingTranslations() error {

diff --git a/hugolib/page.go b/hugolib/page.go
index e94b6c9428401681d5831315412e4b90109032e3..583ff8ba46b35f3e9eae510160d7423a37d8fb2f 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -1351,11 +1351,7 @@ func (p *Page) saveSourceAs(path string, safe bool) error {
        bc := make([]byte, b.Len(), b.Len())
        copy(bc, b.Bytes())
 
-       err := p.saveSource(bc, path, safe)
-       if err != nil {
-               return err
-       }
-       return nil
+       return p.saveSource(bc, path, safe)
 }
 
 func (p *Page) saveSource(by []byte, inpath string, safe bool) (err error) {

diff --git a/hugolib/permalinks.go b/hugolib/permalinks.go
index b2b7377b8c25a3399be7a23c8c802d50e2017229..b924673ff496012be62062720fb4f3254e0f3e0f 100644 (file)
--- a/hugolib/permalinks.go
+++ b/hugolib/permalinks.go
@@ -197,5 +197,5 @@ func init() {
                "filename":    pageToPermalinkFilename,
        }
 
-       attributeRegexp = regexp.MustCompile(":\\w+")
+       attributeRegexp = regexp.MustCompile(`:\w+`)
 }

diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go
index 3ea9ed4e648d5e84be97b1314e4c8d02820061a2..ec3acfb72d9c9bd0cc97238583b54fa3060b60b6 100644 (file)
--- a/hugolib/shortcode_test.go
+++ b/hugolib/shortcode_test.go
@@ -72,12 +72,8 @@ title: "Title"
        require.Len(t, h.Sites[0].RegularPages, 1)
 
        output := strings.TrimSpace(string(h.Sites[0].RegularPages[0].Content))
-       if strings.HasPrefix(output, "<p>") {
-               output = output[3:]
-       }
-       if strings.HasSuffix(output, "</p>") {
-               output = output[:len(output)-4]
-       }
+       output = strings.TrimPrefix(output, "<p>")
+       output = strings.TrimSuffix(output, "</p>")
 
        expected = strings.TrimSpace(expected)
 

diff --git a/hugolib/site.go b/hugolib/site.go
index 24a7f95cd5b16e495385c591cc3835160017f085..0c37b388261ed92d67559bf1cc07570a01b17d44 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -1797,7 +1797,7 @@ Your rendered home page is blank: /index.html is zero-length
 
 func (s *Site) renderForLayouts(name string, d interface{}, w io.Writer, layouts ...string) error {
        layout, found := s.findFirstLayout(layouts...)
-       if found == false {
+       if !found {
                jww.WARN.Printf("Unable to locate layout for %s: %s\n", name, layouts)
                return nil
        }

diff --git a/hugolib/site_render.go b/hugolib/site_render.go
index c8a7df86adef413f030bcc280b179c6ecd10ab0b..82523e88f5eb5895fdfa9fc18117474c47486611 100644 (file)
--- a/hugolib/site_render.go
+++ b/hugolib/site_render.go
@@ -159,11 +159,8 @@ func (s *Site) renderRSS(p *Page) error {
        rssPath := path.Join(rssPage.URLPath.URL, rssURI)
        s.setPageURLs(rssPage, rssPath)
 
-       if err := s.renderAndWriteXML(rssPage.Title, rssPage.addLangFilepathPrefix(rssPath), rssPage, s.appendThemeTemplates(layouts)...); err != nil {
-               return err
-       }
-
-       return nil
+       return s.renderAndWriteXML(rssPage.Title,
+               rssPage.addLangFilepathPrefix(rssPath), rssPage, s.appendThemeTemplates(layouts)...)
 }
 
 func (s *Site) render404() error {
@@ -178,11 +175,9 @@ func (s *Site) render404() error {
        s.setPageURLs(p, "404.html")
 
        nfLayouts := []string{"404.html"}
-       if nfErr := s.renderAndWritePage("404 page", "404.html", p, s.appendThemeTemplates(nfLayouts)...); nfErr != nil {
-               return nfErr
-       }
 
-       return nil
+       return s.renderAndWritePage("404 page", "404.html", p, s.appendThemeTemplates(nfLayouts)...)
+
 }
 
 func (s *Site) renderSitemap() error {
@@ -223,11 +218,9 @@ func (s *Site) renderSitemap() error {
 
        smLayouts := []string{"sitemap.xml", "_default/sitemap.xml", "_internal/_default/sitemap.xml"}
        addLanguagePrefix := n.Site.IsMultiLingual()
-       if err := s.renderAndWriteXML("sitemap", n.addLangPathPrefixIfFlagSet(page.Sitemap.Filename, addLanguagePrefix), n, s.appendThemeTemplates(smLayouts)...); err != nil {
-               return err
-       }
 
-       return nil
+       return s.renderAndWriteXML("sitemap",
+               n.addLangPathPrefixIfFlagSet(page.Sitemap.Filename, addLanguagePrefix), n, s.appendThemeTemplates(smLayouts)...)
 }
 
 func (s *Site) renderRobotsTXT() error {