fixing staticcheck errors

frictionlessdata · Mar 29, 2022 · f1112b4 · f1112b4
1 parent c3a8d20
commit f1112b4
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 17 deletions.
diff --git a/csv/iterator_test.go b/csv/iterator_test.go
@@ -6,10 +6,6 @@ import (
 	"github.com/matryer/is"
 )
 
-type iterTestValue struct {
-	Name string
-}
-
 const (
 	dontSkipHeaders = false
 	skipHeaders     = true

diff --git a/csv/table.go b/csv/table.go
@@ -214,7 +214,7 @@ func Remote(url string) Source {
 		}
 		defer resp.Body.Close()
 		body, err := ioutil.ReadAll(resp.Body)
-		return stringReadCloser(string(body)), nil
+		return stringReadCloser(string(body)), err
 	}
 }
 

diff --git a/csv/table_test.go b/csv/table_test.go
@@ -12,10 +12,6 @@ import (
 	"github.com/matryer/is"
 )
 
-type csvRow struct {
-	Name string
-}
-
 func ExampleTable_Iter() {
 	table, _ := NewTable(FromString("\"name\"\nfoo\nbar"), LoadHeaders())
 	iter, _ := table.Iter()
@@ -158,6 +154,7 @@ func TestReadAll(t *testing.T) {
 		func() (io.ReadCloser, error) {
 			return nil, errors.New("this is a source test error")
 		})
+	is.NoErr(err)
 	_, err = table.ReadAll()
 	is.True(err != nil)
 }

diff --git a/examples/constraints/main.go b/examples/constraints/main.go
@@ -49,7 +49,9 @@ func main() {
 		Capital float64
 		URL     string
 	}{}
-
+	if err != nil {
+		log.Fatalf("Error creating table: %q", err)
+	}
 	if err := capitalSchema.CastTable(table, &capitals); err != nil {
 		log.Fatalf("Error casting table: %q", err)
 	}

diff --git a/examples/validate/main.go b/examples/validate/main.go
@@ -49,7 +49,9 @@ func main() {
 		Capital float64
 		URL     string
 	}{}
-
+	if err != nil {
+		log.Fatalf("Error creating table: %q", err)
+	}
 	iter, _ := table.Iter()
 	for iter.Next() {
 		if err := capitalSchema.CastRow(iter.Row(), &capitalRow); err != nil {

diff --git a/schema/boolean.go b/schema/boolean.go
@@ -20,18 +20,18 @@ func castBoolean(value string, trueValues, falseValues []string) (bool, error) {
 }
 
 func uncastBoolean(value interface{}, trueValues, falseValues []string) (string, error) {
-	switch value.(type) {
+	switch val := value.(type) {
 	case bool:
 		return fmt.Sprintf("%v", value), nil
 	case string:
 		for _, v := range trueValues {
 			if value == v {
-				return value.(string), nil
+				return val, nil
 			}
 		}
 		for _, v := range falseValues {
 			if value == v {
-				return value.(string), nil
+				return val, nil
 			}
 		}
 	}

diff --git a/schema/duration.go b/schema/duration.go
@@ -21,7 +21,7 @@ const (
 func castDuration(value string) (time.Duration, error) {
 	matches := durationRegexp.FindStringSubmatch(value)
 	if len(matches) == 0 {
-		return 0, fmt.Errorf("Invalid duration:\"%s\"", value)
+		return 0, fmt.Errorf("invalid duration:\"%s\"", value)
 	}
 	years := parseIntDuration(matches[1], hoursInYear)
 	months := parseIntDuration(matches[2], hoursInMonth)

diff --git a/schema/geopoint.go b/schema/geopoint.go
@@ -32,7 +32,7 @@ func (p *GeoPoint) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	if a.Lon == nil || a.Lat == nil {
-		return fmt.Errorf("Invalid geopoint:\"%s\"", string(data))
+		return fmt.Errorf("invalid geopoint:\"%s\"", string(data))
 	}
 	p.Lon = *a.Lon
 	p.Lat = *a.Lat
@@ -63,7 +63,7 @@ func castGeoPoint(format, value string) (GeoPoint, error) {
 func applyGeoPointRegexp(r *regexp.Regexp, value string) (GeoPoint, error) {
 	matches := r.FindStringSubmatch(value)
 	if len(matches) == 0 || len(matches[1]) == 0 || len(matches[2]) == 0 {
-		return GeoPoint{}, fmt.Errorf("Invalid geopoint:\"%s\"", value)
+		return GeoPoint{}, fmt.Errorf("invalid geopoint:\"%s\"", value)
 	}
 	lon, _ := strconv.ParseFloat(matches[1], 64)
 	lat, _ := strconv.ParseFloat(matches[2], 64)