Skip to content

Commit

Permalink
Static-check fixes from @lespea #1657, batch 4/n
Browse files Browse the repository at this point in the history
  • Loading branch information
johnkerl committed Oct 27, 2024
1 parent cb2981c commit e6bff2d
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions docs/src/miller-as-library/main3.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ func convert_csv_to_json(fileNames []string) error {
case ierr := <-inputErrorChannel:
retval = ierr
break
case _ = <-dataProcessingErrorChannel:
case <-dataProcessingErrorChannel:
retval = errors.New("exiting due to data error") // details already printed
break
case _ = <-doneWritingChannel:
case <-doneWritingChannel:
done = true
break
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/bifs/arithmetic.go
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,7 @@ func BIF_minlen_variadic(mlrvals []*mlrval.Mlrval) *mlrval.Mlrval {
}
// Do the bulk arithmetic on native ints not Mlrvals, to avoid unnecessary allocation.
retval := lib.UTF8Strlen(mlrvals[0].OriginalString())
for i, _ := range mlrvals {
for i := range mlrvals {
clen := lib.UTF8Strlen(mlrvals[i].OriginalString())

Check failure on line 950 in pkg/bifs/arithmetic.go

View workflow job for this annotation

GitHub Actions / Codespell

clen ==> clean, clan
if clen < retval {
retval = clen
Expand Down Expand Up @@ -1116,7 +1116,7 @@ func BIF_maxlen_variadic(mlrvals []*mlrval.Mlrval) *mlrval.Mlrval {
}
// Do the bulk arithmetic on native ints not Mlrvals, to avoid unnecessary allocation.
retval := lib.UTF8Strlen(mlrvals[0].OriginalString())
for i, _ := range mlrvals {
for i := range mlrvals {
clen := lib.UTF8Strlen(mlrvals[i].OriginalString())
if clen > retval {
retval = clen
Expand Down
6 changes: 3 additions & 3 deletions pkg/bifs/regex.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func BIF_strmatchx(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
captures_array := make([]*mlrval.Mlrval, len(captures))

if len(captures) > 0 {
for i, _ := range captures {
for i := range captures {
if i == 0 {
results.PutReference("full_capture", mlrval.FromString(captures[i]))
} else {
Expand All @@ -156,7 +156,7 @@ func BIF_strmatchx(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
}

starts_array := make([]*mlrval.Mlrval, len(starts))
for i, _ := range starts {
for i := range starts {
if i == 0 {
results.PutReference("full_start", mlrval.FromInt(int64(starts[i])))
} else {
Expand All @@ -165,7 +165,7 @@ func BIF_strmatchx(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
}

ends_array := make([]*mlrval.Mlrval, len(ends))
for i, _ := range ends {
for i := range ends {
if i == 0 {
results.PutReference("full_end", mlrval.FromInt(int64(ends[i])))
} else {
Expand Down
4 changes: 2 additions & 2 deletions pkg/bifs/stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ func bif_percentiles_impl(

outputs := make([]*mlrval.Mlrval, len(ps))

for i, _ := range ps {
for i := range ps {
p, ok := ps[i].GetNumericToFloatValue()
if !ok {
outputs[i] = type_error_named_argument(funcname, "numeric", "percentile", ps[i])
Expand All @@ -655,7 +655,7 @@ func bif_percentiles_impl(
return mlrval.FromArray(outputs)
} else {
m := mlrval.NewMlrmap()
for i, _ := range ps {
for i := range ps {
sp := ps[i].String()
m.PutCopy(sp, outputs[i])
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/input/line_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func channelizedLineReader(
// quickly, as it should.
if i%recordsPerBatch == 0 {
select {
case _ = <-downstreamDoneChannel:
case <-downstreamDoneChannel:
done = true
break
default:
Expand Down
2 changes: 1 addition & 1 deletion pkg/input/pseudo_reader_gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (reader *PseudoReaderGen) process(
// avoid goroutine-scheduler thrash.
eof := false
select {
case _ = <-downstreamDoneChannel:
case <-downstreamDoneChannel:
eof = true
break
default:
Expand Down
2 changes: 1 addition & 1 deletion pkg/input/record_reader_csv.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func channelizedCSVRecordScanner(
// quickly, as it should.
if i%recordsPerBatch == 0 {
select {
case _ = <-downstreamDoneChannel:
case <-downstreamDoneChannel:
done = true
break
default:
Expand Down
2 changes: 1 addition & 1 deletion pkg/input/record_reader_json.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (reader *RecordReaderJSON) processHandle(
i++
if i%recordsPerBatch == 0 {
select {
case _ = <-downstreamDoneChannel:
case <-downstreamDoneChannel:
eof = true
break
default:
Expand Down
4 changes: 2 additions & 2 deletions pkg/input/record_reader_pprint.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func getRecordBatchExplicitPprintHeader(
continue
}
fields := make([]string, npad-2)
for i, _ := range paddedFields {
for i := range paddedFields {
if i == 0 || i == npad-1 {
continue
}
Expand Down Expand Up @@ -361,7 +361,7 @@ func getRecordBatchImplicitPprintHeader(
paddedFields := reader.fieldSplitter.Split(line)
npad := len(paddedFields)
fields := make([]string, npad-2)
for i, _ := range paddedFields {
for i := range paddedFields {
if i == 0 || i == npad-1 {
continue
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/input/record_reader_xtab.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func channelizedStanzaScanner(
// quickly, as it should.
if numStanzasSeen%recordsPerBatch == 0 {
select {
case _ = <-downstreamDoneChannel:
case <-downstreamDoneChannel:
done = true
break
default:
Expand Down
2 changes: 1 addition & 1 deletion pkg/mlrval/mlrval_output.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func (mv *Mlrval) StringifyValuesRecursively() {
switch mv.mvtype {

case MT_ARRAY:
for i, _ := range mv.intf.([]*Mlrval) {
for i := range mv.intf.([]*Mlrval) {
mv.intf.([]*Mlrval)[i].StringifyValuesRecursively()
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/platform/getargs_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func GetArgs() []string {
//printArgs(retargs, "NEW")

globbed := make([]string, 0)
for i, _ := range retargs {
for i := range retargs {
// Expand things like *.csv
matches, err := filepath.Glob(retargs[i])
if matches != nil && err == nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/terminals/repl/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func (repl *Repl) handleSession(istream *os.File) error {
doneDraining := false
for {
select {
case _ = <-repl.appSignalNotificationChannel:
case <-repl.appSignalNotificationChannel:
line = "" // Ignore any partially-entered line -- a ^C should do that
default:
doneDraining = true
Expand Down
2 changes: 1 addition & 1 deletion pkg/transformers/tee.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ func (tr *TransformerTee) Transform(
// But 'mlr cut -f foo then tee bar.txt then head -n 10' -- one does expect
// bar.txt to have all the output from cut.
select {
case _ = <-inputDownstreamDoneChannel:
case <-inputDownstreamDoneChannel:
// Do not write this to the coutputDownstreamDoneChannel, as other transformers do
break
default:
Expand Down

0 comments on commit e6bff2d

Please sign in to comment.