shithub: hugo

Info  •  Files  •  Log  •  Branches

Fix errors reported by Go Vet

--- a/commands/server_test.go

+++ b/commands/server_test.go

@@ -34,7 +34,7 @@

 		serverPort = test.Port

 		result, err := fixUrl(BaseUrl)

 		if err != nil {

-			t.Errorf("Test #%d %s: unexpected error %s", err)

+			t.Errorf("Test #%d %s: unexpected error %s", i, test.TestName, err)

 		}

 		if result != test.Result {

 			t.Errorf("Test #%d %s: expected %q, got %q", i, test.TestName, test.Result, result)

--- a/helpers/content.go

+++ b/helpers/content.go

@@ -111,7 +111,7 @@

 	return template.HTML(string(b))

 }

-func GetHtmlRenderer(defaultFlags int, ctx RenderingContext) blackfriday.Renderer {

+func GetHtmlRenderer(defaultFlags int, ctx *RenderingContext) blackfriday.Renderer {

 	renderParameters := blackfriday.HtmlRendererParameters{

 		FootnoteAnchorPrefix:       viper.GetString("FootnoteAnchorPrefix"),

 		FootnoteReturnLinkContents: viper.GetString("FootnoteReturnLinkContents"),

@@ -141,7 +141,7 @@

 	return blackfriday.HtmlRendererWithParameters(htmlFlags, "", "", renderParameters)

 }

-func GetMarkdownExtensions(ctx RenderingContext) int {

+func GetMarkdownExtensions(ctx *RenderingContext) int {

 	flags := 0 | blackfriday.EXTENSION_NO_INTRA_EMPHASIS |

 		blackfriday.EXTENSION_TABLES | blackfriday.EXTENSION_FENCED_CODE |

 		blackfriday.EXTENSION_AUTOLINK | blackfriday.EXTENSION_STRIKETHROUGH |

@@ -155,12 +155,12 @@

 	return flags

 }

-func MarkdownRender(ctx RenderingContext) []byte {

+func MarkdownRender(ctx *RenderingContext) []byte {

 	return blackfriday.Markdown(ctx.Content, GetHtmlRenderer(0, ctx),

 		GetMarkdownExtensions(ctx))

 }

-func MarkdownRenderWithTOC(ctx RenderingContext) []byte {

+func MarkdownRenderWithTOC(ctx *RenderingContext) []byte {

 	return blackfriday.Markdown(ctx.Content,

 		GetHtmlRenderer(blackfriday.HTML_TOC, ctx),

 		GetMarkdownExtensions(ctx))

@@ -219,7 +219,7 @@

 	return c.Config

 }

-func RenderBytesWithTOC(ctx RenderingContext) []byte {

+func RenderBytesWithTOC(ctx *RenderingContext) []byte {

 	switch ctx.PageFmt {

 	default:

 		return MarkdownRenderWithTOC(ctx)

@@ -230,7 +230,7 @@

 	}

 }

-func RenderBytes(ctx RenderingContext) []byte {

+func RenderBytes(ctx *RenderingContext) []byte {

 	switch ctx.PageFmt {

 	default:

 		return MarkdownRender(ctx)

--- a/helpers/general_test.go

+++ b/helpers/general_test.go

@@ -204,7 +204,7 @@

 		result, err := DoArithmetic(this.a, this.b, this.op)

 		if b, ok := this.expect.(bool); ok && !b {

 			if err == nil {

-				t.Errorf("[%d] doArithmetic didn't return an expected error")

+				t.Errorf("[%d] doArithmetic didn't return an expected error", i)

 			}

 		} else {

 			if err != nil {

--- a/helpers/path_test.go

+++ b/helpers/path_test.go

@@ -107,7 +107,7 @@

 	_, error := MakePathRelative("a/b/c.ss", "/a/c", "/d/c", "/e/f")

 	if error == nil {

-		t.Errorf("Test #%d failed. Expected error")

+		t.Errorf("Test failed, expected error")

 	}

 }

@@ -497,7 +497,7 @@

 			t.Errorf("Test %d failed. Expected filename %q got %q.", i, d.expectedFile, file)

 		}

 		if d.expectedExt != ext {

-			t.Errorf("Test %d failed. Expected extension $q got %q.", i, d.expectedExt, ext)

+			t.Errorf("Test %d failed. Expected extension %q got %q.", i, d.expectedExt, ext)

 		}

 	}

@@ -564,7 +564,7 @@

 			t.Errorf("Test %d failed. Expected %q but got %q", i, d.expectedDir, dir)

 		}

 		if d.expectedErr != err {

-			t.Error("Test %d failed. Expected %q but got %q", i, d.expectedErr, err)

+			t.Errorf("Test %d failed. Expected %q but got %q", i, d.expectedErr, err)

 		}

 	}

 }

@@ -639,7 +639,7 @@

 		}

 		contents, e := ioutil.ReadFile(d.filename)

 		if e != nil {

-			t.Error("Test %d failed. Could not read file %s. Reason: %s\n", i, d.filename, e)

+			t.Errorf("Test %d failed. Could not read file %s. Reason: %s\n", i, d.filename, e)

 		}

 		if randomString != string(contents) {

 			t.Errorf("Test %d failed. Expected contents %q but got %q", i, randomString, string(contents))

--- a/hugolib/page.go

+++ b/hugolib/page.go

@@ -199,12 +199,12 @@

 func (p *Page) renderBytes(content []byte) []byte {

 	return helpers.RenderBytes(

-		helpers.RenderingContext{Content: content, PageFmt: p.guessMarkupType(),

+		&helpers.RenderingContext{Content: content, PageFmt: p.guessMarkupType(),

 			DocumentId: p.UniqueId(), Config: p.getRenderingConfig()})

 }

 func (p *Page) renderContent(content []byte) []byte {

-	return helpers.RenderBytesWithTOC(helpers.RenderingContext{Content: content, PageFmt: p.guessMarkupType(),

+	return helpers.RenderBytesWithTOC(&helpers.RenderingContext{Content: content, PageFmt: p.guessMarkupType(),

 		DocumentId: p.UniqueId(), Config: p.getRenderingConfig()})

 }

--- a/hugolib/shortcode.go

+++ b/hugolib/shortcode.go

@@ -201,7 +201,7 @@

 		}

 		if sc.doMarkup {

-			newInner := helpers.RenderBytes(helpers.RenderingContext{

+			newInner := helpers.RenderBytes(&helpers.RenderingContext{

 				Content: []byte(inner), PageFmt: p.guessMarkupType(),

 				DocumentId: p.UniqueId(), Config: p.getRenderingConfig()})

--- a/hugolib/site_test.go

+++ b/hugolib/site_test.go

@@ -230,7 +230,7 @@

 		}

 		if p.Section() != test.expectedSection {

-			t.Errorf("%s => p.Section expected: %s, got: %s", test.doc, test.expectedSection, p.Section)

+			t.Errorf("%s => p.Section expected: %s, got: %s", test.doc, test.expectedSection, p.Section())

 		}

 	}

 }

--- a/tpl/template.go

+++ b/tpl/template.go

@@ -835,7 +835,7 @@

 }

 func Markdownify(text string) template.HTML {

-	return template.HTML(helpers.RenderBytes(helpers.RenderingContext{Content: []byte(text), PageFmt: "markdown"}))

+	return template.HTML(helpers.RenderBytes(&helpers.RenderingContext{Content: []byte(text), PageFmt: "markdown"}))

 }

 func refPage(page interface{}, ref, methodName string) template.HTML {

--- a/tpl/template_test.go

+++ b/tpl/template_test.go

@@ -941,7 +941,7 @@

 	} {

 		tmpl, err := template.New("test").Parse(this.tmplStr)

 		if err != nil {

-			t.Errorf("[%d] unable to create new html template %q: %s", this.tmplStr, err)

+			t.Errorf("[%d] unable to create new html template %q: %s", i, this.tmplStr, err)

 			continue

 		}

@@ -976,7 +976,7 @@

 	} {

 		tmpl, err := template.New("test").Parse(this.tmplStr)

 		if err != nil {

-			t.Errorf("[%d] unable to create new html template %q: %s", this.tmplStr, err)

+			t.Errorf("[%d] unable to create new html template %q: %s", i, this.tmplStr, err)

 			continue

 		}

@@ -1011,7 +1011,7 @@

 	} {

 		tmpl, err := template.New("test").Parse(this.tmplStr)

 		if err != nil {

-			t.Errorf("[%d] unable to create new html template %q: %s", this.tmplStr, err)

+			t.Errorf("[%d] unable to create new html template %q: %s", i, this.tmplStr, err)

 			continue

 		}

@@ -1046,7 +1046,7 @@

 	} {

 		tmpl, err := template.New("test").Parse(this.tmplStr)

 		if err != nil {

-			t.Errorf("[%d] unable to create new html template %q: %s", this.tmplStr, err)

+			t.Errorf("[%d] unable to create new html template %q: %s", i, this.tmplStr, err)

 			continue

 		}

-- 

⑨