Merge pull request #51 from lalamove/lint

linting return err directly

config.go

@@ -252,7 +252,7 @@ func (c *S) RegisterLoaderWatcher(lw LoaderWatcher, loaderHooks ...func(Store) e
 }
 
 // RegisterCloser adds a closer to the list of closers.
-// Closers are closed when an error occured while reloading a config and the ExitOnError config is set to true
+// Closers are closed when an error occurred while reloading a config and the ExitOnError config is set to true
 func RegisterCloser(closer io.Closer) Store {
 	return instance().RegisterCloser(closer)
 }

parser/kpkeyval/kvparser.go

@@ -56,8 +56,5 @@ func (k *Parser) Parse(r io.Reader, cfg konfig.Values) error {
 		}
 		cfg.Set(cfgKey[0], strings.Join(cfgKey[1:], k.cfg.Sep))
 	}
-	if err := scanner.Err(); err != nil {
-		return err
-	}
-	return nil
+	return scanner.Err()
 }

watcher/kwfile/filewatcher.go

@@ -17,7 +17,7 @@ var defaultRate = 10 * time.Second
 type Config struct {
 	// Files is the path to the files to watch
 	Files []string
-	// Rate is the rate at wich the file is watched
+	// Rate is the rate at which the file is watched
 	Rate time.Duration
 	// Debug sets the debug mode on the filewatcher
 	Debug bool