diff options
author | 6543 <6543@obermui.de> | 2022-01-20 18:46:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-20 18:46:10 +0100 |
commit | 54e9ee37a7a301dbe74d46fd3c87712e6120e9bf (patch) | |
tree | 1be12fb072625c1b896b9d72f7912b018aad502b /modules/csv | |
parent | 1d98d205f5825f40110e6628b61a97c91ac7f72d (diff) | |
download | gitea-54e9ee37a7a301dbe74d46fd3c87712e6120e9bf.tar.gz gitea-54e9ee37a7a301dbe74d46fd3c87712e6120e9bf.zip |
format with gofumpt (#18184)
* gofumpt -w -l .
* gofumpt -w -l -extra .
* Add linter
* manual fix
* change make fmt
Diffstat (limited to 'modules/csv')
-rw-r--r-- | modules/csv/csv.go | 8 | ||||
-rw-r--r-- | modules/csv/csv_test.go | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/modules/csv/csv.go b/modules/csv/csv.go index 47ea62699d..0dd54271f1 100644 --- a/modules/csv/csv.go +++ b/modules/csv/csv.go @@ -17,8 +17,10 @@ import ( "code.gitea.io/gitea/modules/util" ) -const maxLines = 10 -const guessSampleSize = 1e4 // 10k +const ( + maxLines = 10 + guessSampleSize = 1e4 // 10k +) // CreateReader creates a csv.Reader with the given delimiter. func CreateReader(input io.Reader, delimiter rune) *stdcsv.Reader { @@ -35,7 +37,7 @@ func CreateReader(input io.Reader, delimiter rune) *stdcsv.Reader { // CreateReaderAndDetermineDelimiter tries to guess the field delimiter from the content and creates a csv.Reader. // Reads at most guessSampleSize bytes. func CreateReaderAndDetermineDelimiter(ctx *markup.RenderContext, rd io.Reader) (*stdcsv.Reader, error) { - var data = make([]byte, guessSampleSize) + data := make([]byte, guessSampleSize) size, err := util.ReadAtMost(rd, data) if err != nil { return nil, err diff --git a/modules/csv/csv_test.go b/modules/csv/csv_test.go index 41c4ddaee2..b1e928ae99 100644 --- a/modules/csv/csv_test.go +++ b/modules/csv/csv_test.go @@ -31,7 +31,7 @@ func decodeSlashes(t *testing.T, s string) string { } func TestCreateReaderAndDetermineDelimiter(t *testing.T) { - var cases = []struct { + cases := []struct { csv string expectedRows [][]string expectedDelimiter rune @@ -135,7 +135,7 @@ func TestDetermineDelimiterReadAllError(t *testing.T) { } func TestDetermineDelimiter(t *testing.T) { - var cases = []struct { + cases := []struct { csv string filename string expectedDelimiter rune @@ -236,7 +236,7 @@ John Doe john@doe.com This,note,had,a,lot,of,commas,to,test,delimiters`, } func TestRemoveQuotedString(t *testing.T) { - var cases = []struct { + cases := []struct { text string expectedText string }{ @@ -301,7 +301,7 @@ abc | |123 } func TestGuessDelimiter(t *testing.T) { - var cases = []struct { + cases := []struct { csv string expectedDelimiter rune }{ @@ -456,7 +456,7 @@ jkl`, } func TestGuessFromBeforeAfterQuotes(t *testing.T) { - var cases = []struct { + cases := []struct { csv string expectedDelimiter rune }{ @@ -562,7 +562,7 @@ func (l mockLocale) TrN(_cnt interface{}, key1, _keyN string, _args ...interface } func TestFormatError(t *testing.T) { - var cases = []struct { + cases := []struct { err error expectedMessage string expectsError bool |