hugolib: apply some Hugolint rules

diff --git a/hugolib/handler_base.go b/hugolib/handler_base.go
index 7f02973c5edef5c1f1b050005f7b91b6ea88e039..f74409166ac81e731bd80998005bbbe5b604bd41 100644 (file)
--- a/hugolib/handler_base.go
+++ b/hugolib/handler_base.go
@@ -56,6 +56,6 @@ func (h HandledResult) String() string {
        return h.Error()
 }
 
-func (hr HandledResult) Page() *Page {
-       return hr.page
+func (h HandledResult) Page() *Page {
+       return h.page
 }

diff --git a/hugolib/handler_page.go b/hugolib/handler_page.go
index b3b236344c24dfc74a70a9458af090fd9ca6df1d..5e92ff7e93f490811c232ffd04845f0a9bd66d2f 100644 (file)
--- a/hugolib/handler_page.go
+++ b/hugolib/handler_page.go
@@ -65,9 +65,8 @@ func (h markdownHandler) PageConvert(p *Page, t tpl.Template) HandledResult {
                if err != nil {
                        jww.FATAL.Printf("Fail to replace short code tokens in %s:\n%s", p.BaseFileName(), err.Error())
                        return HandledResult{err: err}
-               } else {
-                       tmpContent = tmpContentWithTokensReplaced
                }
+               tmpContent = tmpContentWithTokensReplaced
        }
 
        p.Content = helpers.BytesToHTML(tmpContent)
@@ -118,9 +117,8 @@ func (h rstHandler) PageConvert(p *Page, t tpl.Template) HandledResult {
                if err != nil {
                        jww.FATAL.Printf("Fail to replace short code tokens in %s:\n%s", p.BaseFileName(), err.Error())
                        return HandledResult{err: err}
-               } else {
-                       tmpContent = tmpContentWithTokensReplaced
                }
+               tmpContent = tmpContentWithTokensReplaced
        }
 
        p.Content = helpers.BytesToHTML(tmpContent)