shithub: hugo

Info  •  Files  •  Log  •  Branches

hugolib: Simplify Page.Eq

--- a/hugolib/site_sections.go

+++ b/hugolib/site_sections.go

@@ -112,14 +112,13 @@

 // Eq returns whether the current page equals the given page.

 // Note that this is more accurate than doing `{{ if eq $page $otherPage }}`

 // since a Page can be embedded in another type.

-func (p *Page) Eq(other interface{}) (bool, error) {

+func (p *Page) Eq(other interface{}) bool {

 	pp, err := unwrapPage(other)

 	if err != nil {

-		// Do not return an error on type mismatch.

-		return false, nil

+		return false

 	}

-	return p == pp, nil

+	return p == pp

 }

 func unwrapPage(in interface{}) (*Page, error) {

--- a/hugolib/site_sections_test.go

+++ b/hugolib/site_sections_test.go

@@ -150,14 +150,9 @@

 			assert.NotNil(d)

 			assert.Equal("T41_-1", d.Title)

-			equals, err := c.Eq(d)

-			assert.NoError(err)

-			assert.False(equals)

-			equals, err = c.Eq(c)

-			assert.NoError(err)

-			assert.True(equals)

-			_, err = c.Eq("asdf")

-			assert.Error(err)

+			assert.False(c.Eq(d))

+			assert.True(c.Eq(c))

+			assert.False(c.Eq("asdf"))

 		}},

 		{"empty3", func(p *Page) {

-- 

⑨