From 457703b6b6c74ff24467c07aaaefb13a6058af68 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Thu, 27 Aug 2020 08:32:18 -0400 Subject: [PATCH] gofmt all --- go/fmter | 3 +++ go/mlr.go | 2 +- go/src/miller/containers/lrec.go | 8 ++++---- go/src/miller/input/record_reader_dkvp.go | 4 ++-- go/src/miller/input/record_reader_factory.go | 7 +++++-- go/src/miller/mapping/mapper_cat.go | 3 +-- go/src/miller/mapping/mapper_foo.go | 3 +-- go/src/miller/mapping/mapper_nothing.go | 3 +-- go/src/miller/mapping/mapper_tac.go | 2 +- go/src/miller/mapping/record_mapper_factory.go | 12 ++++++++---- go/src/miller/output/record_writer_csv.go | 2 +- go/src/miller/output/record_writer_dkvp.go | 2 +- go/src/miller/output/record_writer_nidx.go | 2 +- go/src/miller/output/record_writer_xtab.go | 2 +- 14 files changed, 31 insertions(+), 24 deletions(-) create mode 100755 go/fmter diff --git a/go/fmter b/go/fmter new file mode 100755 index 000000000..269008b05 --- /dev/null +++ b/go/fmter @@ -0,0 +1,3 @@ +#!/bin/bash + +for x in $(lsr \*.go); do gofmt -w $x; done diff --git a/go/mlr.go b/go/mlr.go index f6c8f4c8e..8fc0ce1d3 100644 --- a/go/mlr.go +++ b/go/mlr.go @@ -60,7 +60,7 @@ func maybeProfile(cpuprofile *string) { if err := pprof.StartCPUProfile(f); err != nil { log.Fatal("Could not start CPU profile: ", err) } - defer pprof.StopCPUProfile() + defer pprof.StopCPUProfile() } } diff --git a/go/src/miller/containers/lrec.go b/go/src/miller/containers/lrec.go index fdea9a2c4..dda97fca8 100644 --- a/go/src/miller/containers/lrec.go +++ b/go/src/miller/containers/lrec.go @@ -53,15 +53,15 @@ import ( // ---------------------------------------------------------------- type Lrec struct { FieldCount int - Head *lrecEntry - Tail *lrecEntry + Head *lrecEntry + Tail *lrecEntry } type lrecEntry struct { Key *string Value *string - Prev *lrecEntry - Next *lrecEntry + Prev *lrecEntry + Next *lrecEntry } // ---------------------------------------------------------------- diff --git a/go/src/miller/input/record_reader_dkvp.go b/go/src/miller/input/record_reader_dkvp.go index 4fb94490a..9c5c21646 100644 --- a/go/src/miller/input/record_reader_dkvp.go +++ b/go/src/miller/input/record_reader_dkvp.go @@ -16,7 +16,7 @@ type RecordReaderDKVP struct { } func NewRecordReaderDKVP(ifs string, ips string) *RecordReaderDKVP { - return &RecordReaderDKVP { + return &RecordReaderDKVP{ ifs, ips, } @@ -64,7 +64,7 @@ func lrecFromDKVPLine( ) *containers.Lrec { lrec := containers.LrecAlloc() pairs := strings.Split(*line, *ifs) - for _, pair := range(pairs) { + for _, pair := range pairs { kv := strings.SplitN(pair, *ips, 2) // xxx range-check key := kv[0] diff --git a/go/src/miller/input/record_reader_factory.go b/go/src/miller/input/record_reader_factory.go index bc5c959f6..1afc1231b 100644 --- a/go/src/miller/input/record_reader_factory.go +++ b/go/src/miller/input/record_reader_factory.go @@ -1,7 +1,10 @@ package input + func Create(inputFormatName string) RecordReader { switch inputFormatName { - case "dkvp": return NewRecordReaderDKVP(",", "=") // TODO: parameterize - default: return nil + case "dkvp": + return NewRecordReaderDKVP(",", "=") // TODO: parameterize + default: + return nil } } diff --git a/go/src/miller/mapping/mapper_cat.go b/go/src/miller/mapping/mapper_cat.go index d3653ffba..6540aae66 100644 --- a/go/src/miller/mapping/mapper_cat.go +++ b/go/src/miller/mapping/mapper_cat.go @@ -9,8 +9,7 @@ type MapperCat struct { } func NewMapperCat() *MapperCat { - return &MapperCat { - } + return &MapperCat{} } func (this *MapperCat) Name() string { diff --git a/go/src/miller/mapping/mapper_foo.go b/go/src/miller/mapping/mapper_foo.go index 98304f85b..9d7273632 100644 --- a/go/src/miller/mapping/mapper_foo.go +++ b/go/src/miller/mapping/mapper_foo.go @@ -9,8 +9,7 @@ type MapperFoo struct { } func NewMapperFoo() *MapperFoo { - return &MapperFoo { - } + return &MapperFoo{} } func (this *MapperFoo) Name() string { diff --git a/go/src/miller/mapping/mapper_nothing.go b/go/src/miller/mapping/mapper_nothing.go index f975405f0..fdf18fa47 100644 --- a/go/src/miller/mapping/mapper_nothing.go +++ b/go/src/miller/mapping/mapper_nothing.go @@ -9,8 +9,7 @@ type MapperNothing struct { } func NewMapperNothing() *MapperNothing { - return &MapperNothing { - } + return &MapperNothing{} } func (this *MapperNothing) Name() string { diff --git a/go/src/miller/mapping/mapper_tac.go b/go/src/miller/mapping/mapper_tac.go index 8ec46db9e..89309785f 100644 --- a/go/src/miller/mapping/mapper_tac.go +++ b/go/src/miller/mapping/mapper_tac.go @@ -12,7 +12,7 @@ type MapperTac struct { } func NewMapperTac() *MapperTac { - return &MapperTac { + return &MapperTac{ list.New(), } } diff --git a/go/src/miller/mapping/record_mapper_factory.go b/go/src/miller/mapping/record_mapper_factory.go index 533f7513d..b9545def7 100644 --- a/go/src/miller/mapping/record_mapper_factory.go +++ b/go/src/miller/mapping/record_mapper_factory.go @@ -2,9 +2,13 @@ package mapping func Create(mapperName string) RecordMapper { switch mapperName { - case "cat": return NewMapperCat() - case "nothing": return NewMapperNothing() - case "tac": return NewMapperTac() - default: return nil + case "cat": + return NewMapperCat() + case "nothing": + return NewMapperNothing() + case "tac": + return NewMapperTac() + default: + return nil } } diff --git a/go/src/miller/output/record_writer_csv.go b/go/src/miller/output/record_writer_csv.go index 01246aa07..e8c1d7ebf 100644 --- a/go/src/miller/output/record_writer_csv.go +++ b/go/src/miller/output/record_writer_csv.go @@ -10,7 +10,7 @@ import ( // ostream *os.File in constructors/factory type RecordWriterCSV struct { - onFirst bool + onFirst bool csvWriter *csv.Writer } diff --git a/go/src/miller/output/record_writer_dkvp.go b/go/src/miller/output/record_writer_dkvp.go index 9a4b8d322..144b916b2 100644 --- a/go/src/miller/output/record_writer_dkvp.go +++ b/go/src/miller/output/record_writer_dkvp.go @@ -16,7 +16,7 @@ type RecordWriterDKVP struct { } func NewRecordWriterDKVP(ifs string, ips string) *RecordWriterDKVP { - return &RecordWriterDKVP { + return &RecordWriterDKVP{ ifs, ips, "\n", // TODO: parameterize diff --git a/go/src/miller/output/record_writer_nidx.go b/go/src/miller/output/record_writer_nidx.go index 3d0380afb..e0259d136 100644 --- a/go/src/miller/output/record_writer_nidx.go +++ b/go/src/miller/output/record_writer_nidx.go @@ -15,7 +15,7 @@ type RecordWriterNIDX struct { } func NewRecordWriterNIDX(ifs string) *RecordWriterNIDX { - return &RecordWriterNIDX { + return &RecordWriterNIDX{ ifs, "\n", // TODO: parameterize } diff --git a/go/src/miller/output/record_writer_xtab.go b/go/src/miller/output/record_writer_xtab.go index 69a9f08da..9e75c14c4 100644 --- a/go/src/miller/output/record_writer_xtab.go +++ b/go/src/miller/output/record_writer_xtab.go @@ -14,7 +14,7 @@ type RecordWriterXTAB struct { } func NewRecordWriterXTAB() *RecordWriterXTAB { - return &RecordWriterXTAB { + return &RecordWriterXTAB{ true, } }