lint: golangci: fix various

grokify · Oct 29, 2022 · d7b1c91 · d7b1c91
1 parent 878bc9f
commit d7b1c91
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 41 deletions.
diff --git a/charts/d3/d3bullet/d3bullet.go b/charts/d3/d3bullet/d3bullet.go
@@ -3,7 +3,6 @@ package d3bullet
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 
@@ -117,7 +116,7 @@ func ProjectionToBullet(prjData bullet.ProjectionDataInt, title string, subtitle
 
 func GetJS() []byte {
 	filepath := path.Join(os.Getenv("GOPATH"), "src", JSPath)
-	bytes, err := ioutil.ReadFile(filepath)
+	bytes, err := os.ReadFile(filepath)
 	if err != nil {
 		return []byte("")
 	}

diff --git a/data/documents/documents_read.go b/data/documents/documents_read.go
@@ -2,7 +2,6 @@ package documents
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 
 	"github.com/grokify/mogo/encoding/csvutil"
@@ -65,5 +64,5 @@ func MergeFilterCSVFilesToJSON(inPaths []string, outPath string, inComma rune, p
 	if err != nil {
 		return err
 	}
-	return ioutil.WriteFile(outPath, bytes, perm)
+	return os.WriteFile(outPath, bytes, perm)
 }
diff --git a/data/roadmap/canvas.go b/data/roadmap/canvas.go
@@ -163,47 +163,48 @@ ITEMS:
 }
 
 /*
-type Item struct {
-	MinTime time.Time
-	MaxTime time.Time
-	MinCell int32 // Inflated by Canvas
-	MaxCell int32 // Inflated by Canvas
-	Min     int64 // Inflated by Canvas
-	Max     int64 // Inflated by Canvas
-	Name    string
-	URL     string
-	Color   string
-}
-
-func (i *Item) SetMinMaxQuarter(qtrMin, qtrMax int32) error {
-	if qtrMax < qtrMin {
-		return fmt.Errorf("Max is < min: min [%v] max [%v]", qtrMin, qtrMax)
-	}
-	err := i.SetMinQuarter(qtrMin)
-	if err != nil {
-		return err
+	type Item struct {
+		MinTime time.Time
+		MaxTime time.Time
+		MinCell int32 // Inflated by Canvas
+		MaxCell int32 // Inflated by Canvas
+		Min     int64 // Inflated by Canvas
+		Max     int64 // Inflated by Canvas
+		Name    string
+		URL     string
+		Color   string
+	}
+
+	func (i *Item) SetMinMaxQuarter(qtrMin, qtrMax int32) error {
+		if qtrMax < qtrMin {
+			return fmt.Errorf("Max is < min: min [%v] max [%v]", qtrMin, qtrMax)
+		}
+		err := i.SetMinQuarter(qtrMin)
+		if err != nil {
+			return err
+		}
+		return i.SetMaxQuarter(qtrMax)
 	}
-	return i.SetMaxQuarter(qtrMax)
-}
 
-func (i *Item) SetMinQuarter(qtr int32) error {
-	qt, err := tu.QuarterInt32StartTime(qtr)
-	if err != nil {
-		return err
+	func (i *Item) SetMinQuarter(qtr int32) error {
+		qt, err := tu.QuarterInt32StartTime(qtr)
+		if err != nil {
+			return err
+		}
+		i.MinTime = qt
+		return nil
 	}
-	i.MinTime = qt
-	return nil
-}
 
-func (i *Item) SetMaxQuarter(qtr int32) error {
-	qt, err := tu.QuarterInt32EndTime(qtr)
-	if err != nil {
-		return err
+	func (i *Item) SetMaxQuarter(qtr int32) error {
+		qt, err := tu.QuarterInt32EndTime(qtr)
+		if err != nil {
+			return err
+		}
+		i.MaxTime = qt
+		return nil
 	}
-	i.MaxTime = qt
-	return nil
-}
 */
+
 func GetCanvasQuarter(start, end int32) (Canvas, error) {
 	qs, err := tu.QuarterInt32StartTime(start)
 	if err != nil {

diff --git a/data/table/write.go b/data/table/write.go
@@ -3,7 +3,6 @@ package table
 import (
 	"encoding/csv"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"regexp"
 	"strconv"
@@ -291,5 +290,5 @@ func (tbl *Table) WriteJSON(path string, perm os.FileMode, jsonPrefix, jsonInden
 	if err != nil {
 		return err
 	}
-	return ioutil.WriteFile(path, bytes, perm)
+	return os.WriteFile(path, bytes, perm)
 }