golint compliant and more idiomatic.

ardan-bkennedy · ardan-bkennedy · commit d185ae49b6b3 · 2014-07-16T18:31:48.000-04:00
diff --git a/chapter2/sample/matchers/rss.go b/chapter2/sample/matchers/rss.go
@@ -70,7 +70,7 @@ func init() {
 func (m rssMatcher) Search(feed *search.Feed, searchTerm string) ([]*search.Result, error) {
 	var results []*search.Result
 
-	log.Printf("Search Feed Type[%s] Site[%s] For Uri[%s]\n", feed.Type, feed.Name, feed.Uri)
+	log.Printf("Search Feed Type[%s] Site[%s] For Uri[%s]\n", feed.Type, feed.Name, feed.URI)
 
 	// Retrieve the data to search.
 	document, err := m.retrieve(feed)
@@ -113,12 +113,12 @@ func (m rssMatcher) Search(feed *search.Feed, searchTerm string) ([]*search.Resu
 
 // retrieve performs a HTTP Get request for the rss feed and decodes the results.
 func (m rssMatcher) retrieve(feed *search.Feed) (*rssDocument, error) {
-	if feed.Uri == "" {
+	if feed.URI == "" {
 		return nil, errors.New("No rss feed uri provided")
 	}
 
 	// Retrieve the rss feed document from the web.
-	resp, err := http.Get(feed.Uri)
+	resp, err := http.Get(feed.URI)
 	if err != nil {
 		return nil, err
 	}
diff --git a/chapter2/sample/search/feed.go b/chapter2/sample/search/feed.go
@@ -10,12 +10,12 @@ const dataFile = "data/data.json"
 // Feed contains information we need to process a feed.
 type Feed struct {
 	Name string `json:"site"`
-	Uri  string `json:"link"`
+	URI  string `json:"link"`
 	Type string `json:"type"`
 }
 
 // RetrieveFeeds reads and unmarshals the feed data file.
-func RetrieveFeeds() ([]*Feed, error) {
+func RetrieveFeeds() ([]Feed, error) {
 	// Open the file.
 	file, err := os.Open(dataFile)
 	if err != nil {
@@ -28,7 +28,7 @@ func RetrieveFeeds() ([]*Feed, error) {
 
 	// Decode the file into a slice of pointers
 	// to Feed values.
-	var feeds []*Feed
+	var feeds []Feed
 	err = json.NewDecoder(file).Decode(&feeds)
 
 	// We don't need to check for errors, the caller can do this.
diff --git a/chapter2/sample/search/search.go b/chapter2/sample/search/search.go
@@ -6,7 +6,7 @@ import (
 )
 
 // A map of registered matchers for searching.
-var matchers map[string]Matcher = make(map[string]Matcher)
+var matchers = make(map[string]Matcher)
 
 // Run performs the search logic.
 func Run(searchTerm string) {
@@ -35,8 +35,8 @@ func Run(searchTerm string) {
 		}
 
 		// Launch the goroutine to perform the search.
-		go func(matcher Matcher, feed *Feed) {
-			Match(matcher, feed, searchTerm, results)
+		go func(matcher Matcher, feed Feed) {
+			Match(matcher, &feed, searchTerm, results)
 			waitGroup.Done()
 		}(matcher, feed)
 	}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`// A map of registered matchers for searching.`
`9`		`-var matchers map[string]Matcher = make(map[string]Matcher)`
	`9`	`+var matchers = make(map[string]Matcher)`
`10`	`10`
`11`	`11`	`// Run performs the search logic.`
`12`	`12`	`func Run(searchTerm string) {`
`@@ -35,8 +35,8 @@ func Run(searchTerm string) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// Launch the goroutine to perform the search.`
`38`		`- go func(matcher Matcher, feed *Feed) {`
`39`		`- Match(matcher, feed, searchTerm, results)`
	`38`	`+ go func(matcher Matcher, feed Feed) {`
	`39`	`+ Match(matcher, &feed, searchTerm, results)`
`40`	`40`	`waitGroup.Done()`
`41`	`41`	`}(matcher, feed)`
`42`	`42`	`}`