ref: 6da23f7449366e7699e406adb3334e71ffd1e70e
parent: 1abc2f0b8663a3082c509157952bb756bcd38f92
author: Caleb Spare <[email protected]>
date: Sun Nov 24 08:48:57 EST 2013
Gofmt Command: `gofmt -l -s -w .`
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -43,7 +43,6 @@
}
var hugoCmdV *cobra.Command
-
var BuildWatch, Draft, UglyUrls, Verbose bool
var Source, Destination, BaseUrl, CfgFile string
--- a/hugolib/index.go
+++ b/hugolib/index.go
@@ -39,7 +39,7 @@
func (ip IndexedPages) Pages() Pages {pages := make(Pages, len(ip))
- for i, _ := range ip {+ for i := range ip {pages[i] = ip[i].Page
}
return pages
--- a/hugolib/rss_test.go
+++ b/hugolib/rss_test.go
@@ -1,10 +1,10 @@
package hugolib
import (
- "testing"
"bytes"
"github.com/spf13/hugo/source"
"github.com/spf13/hugo/target"
+ "testing"
)
const RSS_TEMPLATE = `<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
@@ -39,7 +39,7 @@
s.initializeSiteInfo()
s.prepTemplates()
// Add an rss.xml template to invoke the rss build.
- s.addTemplate("rss.xml", RSS_TEMPLATE) + s.addTemplate("rss.xml", RSS_TEMPLATE) if err := s.CreatePages(); err != nil { t.Fatalf("Unable to create pages: %s", err)--- a/hugolib/shortcode.go
+++ b/hugolib/shortcode.go
@@ -185,7 +185,7 @@
// No closing "... just make remainder the final token
if inQuote && i == len(first) {- final = append(final, first[start:len(first)]...)
+ final = append(final, first[start:]...)
}
}
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -326,7 +326,7 @@
}
}
}
- for k, _ := range s.Indexes[plural] {+ for k := range s.Indexes[plural] {s.Indexes[plural][k].Sort()
}
}
@@ -335,7 +335,7 @@
s.Sections.Add(p.Section, WeightedIndexEntry{s.Pages[i].Weight, s.Pages[i]})}
- for k, _ := range s.Sections {+ for k := range s.Sections {s.Sections[k].Sort()
}
@@ -356,7 +356,7 @@
func (s *Site) possibleIndexes() (indexes []string) { for _, p := range s.Pages {- for k, _ := range p.Params {+ for k := range p.Params { if !inStringArray(indexes, k) {indexes = append(indexes, k)
}
--- a/hugolib/siteinfo_test.go
+++ b/hugolib/siteinfo_test.go
@@ -1,12 +1,11 @@
package hugolib
import (
- "testing"
"bytes"
+ "testing"
)
const SITE_INFO_PARAM_TEMPLATE = `{{ .Site.Params.MyGlobalParam }}`-
func TestSiteInfoParams(t *testing.T) { s := &Site{--- a/template/bundle/template_test.go
+++ b/template/bundle/template_test.go
@@ -6,19 +6,19 @@
)
func TestGt(t *testing.T) {- for i, this := range []struct{- left interface{}- right interface{}+ for i, this := range []struct {+ left interface{}+ right interface{}leftShouldWin bool
}{- { 5, 8, false },- { 8, 5, true },- { 5, 5, false },- { -2, 1, false },- { 2, -5, true },- { "8", "5", true },- { "5", "0001", true },- { []int{100,99}, []int{1,2,3,4}, false },+ {5, 8, false},+ {8, 5, true},+ {5, 5, false},+ {-2, 1, false},+ {2, -5, true},+ {"8", "5", true},+ {"5", "0001", true},+ {[]int{100, 99}, []int{1, 2, 3, 4}, false}, } {leftIsBigger := Gt(this.left, this.right)
if leftIsBigger != this.leftShouldWin {@@ -34,14 +34,14 @@
}
func TestFirst(t *testing.T) {- for i, this := range []struct{- count int
+ for i, this := range []struct {+ count int
sequence interface{}- expect interface{}- } {- { 2, []string{"a", "b", "c"}, []string{"a", "b"} },- { 3, []string{"a", "b"}, []string{"a", "b"} },- { 2, []int{100, 200, 300}, []int{100, 200} },+ expect interface{}+ }{+ {2, []string{"a", "b", "c"}, []string{"a", "b"}},+ {3, []string{"a", "b"}, []string{"a", "b"}},+ {2, []int{100, 200, 300}, []int{100, 200}}, } {results, err := First(this.count, this.sequence)
if err != nil {--- a/transform/absurl.go
+++ b/transform/absurl.go
@@ -33,10 +33,10 @@
}
func guardReplace(content, guard, match, replace []byte) []byte {- if !bytes.Contains(content, guard) {- content = bytes.Replace(content, match, replace, -1)
- }
- return content
+ if !bytes.Contains(content, guard) {+ content = bytes.Replace(content, match, replace, -1)
+ }
+ return content
}
type elattr struct {