From 7e1c9b4119fd160190a20d1f6689352dafffb92d Mon Sep 17 00:00:00 2001 From: John Kerl Date: Sun, 28 Jun 2026 17:36:36 -0400 Subject: [PATCH] Next batch of lint fixes (#2108) --- docs/src/manpage.md | 2 +- docs/src/manpage.txt | 2 +- man/manpage.txt | 2 +- man/mlr.1 | 4 ++-- pkg/auxents/hex.go | 3 --- pkg/bifs/random.go | 3 +-- pkg/cli/option_parse.go | 2 -- pkg/climain/mlrcli_mlrrc.go | 2 -- pkg/climain/mlrcli_shebang.go | 2 +- pkg/dkvpx/dkvpx_reader.go | 1 - pkg/dsl/cst/statements.go | 2 +- pkg/dsl/cst/validate.go | 4 ++-- pkg/input/line_reader.go | 1 - pkg/input/record_reader_xtab.go | 1 - pkg/mlrval/mlrval_json.go | 4 ++-- pkg/transformers/altkv.go | 1 - pkg/transformers/bar.go | 2 +- pkg/transformers/cat.go | 2 +- pkg/transformers/check.go | 1 - pkg/transformers/fraction.go | 6 +++--- pkg/transformers/group_by.go | 1 - pkg/transformers/group_like.go | 1 - pkg/transformers/json_stringify.go | 2 +- pkg/transformers/label.go | 1 - pkg/transformers/latin1_to_utf8.go | 1 - pkg/transformers/nest.go | 3 +-- pkg/transformers/nothing.go | 1 - pkg/transformers/regularize.go | 1 - pkg/transformers/remove_empty_columns.go | 1 - pkg/transformers/reshape.go | 3 +-- pkg/transformers/sec2gmtdate.go | 1 - pkg/transformers/seqgen.go | 2 +- pkg/transformers/shuffle.go | 1 - pkg/transformers/skip_trivial_records.go | 1 - pkg/transformers/tac.go | 1 - pkg/transformers/tee.go | 4 ++-- pkg/transformers/utf8_to_latin1.go | 1 - 37 files changed, 23 insertions(+), 50 deletions(-) diff --git a/docs/src/manpage.md b/docs/src/manpage.md index 09a580ada..77db89079 100644 --- a/docs/src/manpage.md +++ b/docs/src/manpage.md @@ -3863,5 +3863,5 @@ This is simply a copy of what you should see on running `man mlr` at a command p MIME Type for Comma-Separated Values (CSV) Files, the Miller docsite https://miller.readthedocs.io - 2026-06-24 4mMILLER24m(1) + 2026-06-28 4mMILLER24m(1) diff --git a/docs/src/manpage.txt b/docs/src/manpage.txt index c3849c6fc..f7973239c 100644 --- a/docs/src/manpage.txt +++ b/docs/src/manpage.txt @@ -3842,4 +3842,4 @@ MIME Type for Comma-Separated Values (CSV) Files, the Miller docsite https://miller.readthedocs.io - 2026-06-24 4mMILLER24m(1) + 2026-06-28 4mMILLER24m(1) diff --git a/man/manpage.txt b/man/manpage.txt index c3849c6fc..f7973239c 100644 --- a/man/manpage.txt +++ b/man/manpage.txt @@ -3842,4 +3842,4 @@ MIME Type for Comma-Separated Values (CSV) Files, the Miller docsite https://miller.readthedocs.io - 2026-06-24 4mMILLER24m(1) + 2026-06-28 4mMILLER24m(1) diff --git a/man/mlr.1 b/man/mlr.1 index 604f0bcda..a07b57d46 100644 --- a/man/mlr.1 +++ b/man/mlr.1 @@ -2,12 +2,12 @@ .\" Title: mlr .\" Author: [see the "AUTHOR" section] .\" Generator: ./mkman.rb -.\" Date: 2026-06-24 +.\" Date: 2026-06-28 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MILLER" "1" "2026-06-24" "\ \&" "\ \&" +.TH "MILLER" "1" "2026-06-28" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Portability definitions .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pkg/auxents/hex.go b/pkg/auxents/hex.go index d1ab0b461..e75939c4e 100644 --- a/pkg/auxents/hex.go +++ b/pkg/auxents/hex.go @@ -89,8 +89,6 @@ func hexDumpFile(istream *os.File, doRaw bool) { for !eof { numBytesRead, err := io.ReadFull(istream, buffer) if err == io.EOF { - err = nil - eof = true break } @@ -144,7 +142,6 @@ func hexDumpFile(istream *os.File, doRaw bool) { // the input is at the terminal, the user will have to control-D twice // which will be unsettling. if numBytesRead < bufferSize { - eof = true break } diff --git a/pkg/bifs/random.go b/pkg/bifs/random.go index 007174db9..2dabfcd44 100644 --- a/pkg/bifs/random.go +++ b/pkg/bifs/random.go @@ -39,8 +39,7 @@ func BIF_urandint(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval { a := input1.AcquireIntValue() b := input2.AcquireIntValue() - var lo int64 = 0 - var hi int64 = 0 + var lo, hi int64 if a <= b { lo = a hi = b + 1 diff --git a/pkg/cli/option_parse.go b/pkg/cli/option_parse.go index 9f81a24a3..d5b40c864 100644 --- a/pkg/cli/option_parse.go +++ b/pkg/cli/option_parse.go @@ -3467,8 +3467,6 @@ var MiscFlagSection = FlagSection{ for !eof { line, err := lineReader.ReadString('\n') if err == io.EOF { - err = nil - eof = true break } lineno++ diff --git a/pkg/climain/mlrcli_mlrrc.go b/pkg/climain/mlrcli_mlrrc.go index 1cdf91d41..209fc2e64 100644 --- a/pkg/climain/mlrcli_mlrrc.go +++ b/pkg/climain/mlrcli_mlrrc.go @@ -56,8 +56,6 @@ func tryLoadMlrrc( for !eof { line, err := lineReader.ReadString('\n') if err == io.EOF { - err = nil - eof = true break } lineno++ diff --git a/pkg/climain/mlrcli_shebang.go b/pkg/climain/mlrcli_shebang.go index 7e0947fea..9ddf20d99 100644 --- a/pkg/climain/mlrcli_shebang.go +++ b/pkg/climain/mlrcli_shebang.go @@ -26,7 +26,7 @@ import ( // * This is how shebang lines work // * There are Miller verbs with -s flags and we don't want to disrupt their behavior. func maybeInterpolateDashS(args []string) ([]string, error) { - stripComments := true + var stripComments bool if len(args) < 2 { return args, nil diff --git a/pkg/dkvpx/dkvpx_reader.go b/pkg/dkvpx/dkvpx_reader.go index 9cb7f3b0b..10949c1f7 100644 --- a/pkg/dkvpx/dkvpx_reader.go +++ b/pkg/dkvpx/dkvpx_reader.go @@ -136,7 +136,6 @@ func (r *Reader) readRecord() (*lib.OrderedMap[string], error) { } line, errRead = r.readLine() if errRead == io.EOF { - errRead = nil finishRecord() return result, nil } diff --git a/pkg/dsl/cst/statements.go b/pkg/dsl/cst/statements.go index 69352dc89..7c16fae84 100644 --- a/pkg/dsl/cst/statements.go +++ b/pkg/dsl/cst/statements.go @@ -13,7 +13,7 @@ func (root *RootNode) BuildStatementNode( astNode *asts.ASTNode, ) (IExecutable, error) { - var statement IExecutable = nil + var statement IExecutable var err error switch astNode.Type { diff --git a/pkg/dsl/cst/validate.go b/pkg/dsl/cst/validate.go index b7b82c483..b33502a95 100644 --- a/pkg/dsl/cst/validate.go +++ b/pkg/dsl/cst/validate.go @@ -71,8 +71,8 @@ func validateASTAux( nextLevelInBeginOrEnd := inBeginOrEnd nextLevelInUDF := inUDF nextLevelInUDS := inUDS - nextLevelIsAssignmentLHS := isAssignmentLHS - nextLevelIsUnset := isUnset + var nextLevelIsAssignmentLHS bool + var nextLevelIsUnset bool if astNode.Type == asts.NodeType(NodeTypeFilterStatement) { if dslInstanceType == DSLInstanceTypeFilter { diff --git a/pkg/input/line_reader.go b/pkg/input/line_reader.go index 0435d3bcb..b677cad7b 100644 --- a/pkg/input/line_reader.go +++ b/pkg/input/line_reader.go @@ -184,7 +184,6 @@ func channelizedLineReader( line, err := lineReader.Read() if err != nil { if lib.IsEOF(err) { - done = true break } else { break diff --git a/pkg/input/record_reader_xtab.go b/pkg/input/record_reader_xtab.go index 4a2cd950c..2fe607e97 100644 --- a/pkg/input/record_reader_xtab.go +++ b/pkg/input/record_reader_xtab.go @@ -157,7 +157,6 @@ func channelizedStanzaScanner( line, err := lineReader.Read() if err != nil { if lib.IsEOF(err) { - done = true break } else { fmt.Fprintf(os.Stderr, "mlr: %v\n", err) diff --git a/pkg/mlrval/mlrval_json.go b/pkg/mlrval/mlrval_json.go index 994cc8040..a26a4f848 100644 --- a/pkg/mlrval/mlrval_json.go +++ b/pkg/mlrval/mlrval_json.go @@ -166,8 +166,8 @@ func MlrvalDecodeFromJSON(decoder *json.Decoder) ( } else { isArray := false - var expectedClosingDelimiter = ' ' - var collectionType = "" + var expectedClosingDelimiter rune + var collectionType string if delimiter == '[' { isArray = true diff --git a/pkg/transformers/altkv.go b/pkg/transformers/altkv.go index 7e6da04cc..d144b6dc2 100644 --- a/pkg/transformers/altkv.go +++ b/pkg/transformers/altkv.go @@ -49,7 +49,6 @@ func transformerAltkvParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerAltkvUsage(os.Stdout) diff --git a/pkg/transformers/bar.go b/pkg/transformers/bar.go index de60e1b68..3cdbc64fa 100644 --- a/pkg/transformers/bar.go +++ b/pkg/transformers/bar.go @@ -195,7 +195,7 @@ func NewTransformerBar( tr.bars = make([]string, width+1) for i := 0; i <= tr.width; i++ { - var bar = "" + var bar string if i == 0 { bar = tr.oobString + strings.Repeat(tr.blankString, width-1) } else if i < width { diff --git a/pkg/transformers/cat.go b/pkg/transformers/cat.go index 146511821..d529284ab 100644 --- a/pkg/transformers/cat.go +++ b/pkg/transformers/cat.go @@ -226,7 +226,7 @@ func (tr *TransformerCat) countersGrouped( inrec := inrecAndContext.Record groupingKey, ok := inrec.GetSelectedValuesJoined(tr.groupByFieldNames) - var counter int64 = 0 + var counter int64 if !ok { // Treat as unkeyed tr.counter++ diff --git a/pkg/transformers/check.go b/pkg/transformers/check.go index 46e291b15..db6332b42 100644 --- a/pkg/transformers/check.go +++ b/pkg/transformers/check.go @@ -52,7 +52,6 @@ func transformerCheckParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerCheckUsage(os.Stdout) diff --git a/pkg/transformers/fraction.go b/pkg/transformers/fraction.go index bbd685f30..b02ccfdb0 100644 --- a/pkg/transformers/fraction.go +++ b/pkg/transformers/fraction.go @@ -246,9 +246,9 @@ func (tr *TransformerFraction) Transform( if value != nil { value.AssertNumeric() // may fatal the process - var numerator *mlrval.Mlrval = nil - var cumu *mlrval.Mlrval = nil - var outputValue *mlrval.Mlrval = nil + var numerator *mlrval.Mlrval + var cumu *mlrval.Mlrval + var outputValue *mlrval.Mlrval if tr.doCumu { cumu = cumusForGroup[fractionFieldName] diff --git a/pkg/transformers/group_by.go b/pkg/transformers/group_by.go index e4d704c03..1fba2b184 100644 --- a/pkg/transformers/group_by.go +++ b/pkg/transformers/group_by.go @@ -48,7 +48,6 @@ func transformerGroupByParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerGroupByUsage(os.Stdout) diff --git a/pkg/transformers/group_like.go b/pkg/transformers/group_like.go index a47d224e9..11977e2a5 100644 --- a/pkg/transformers/group_like.go +++ b/pkg/transformers/group_like.go @@ -48,7 +48,6 @@ func transformerGroupLikeParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerGroupLikeUsage(os.Stdout) diff --git a/pkg/transformers/json_stringify.go b/pkg/transformers/json_stringify.go index e09ef841b..ef8b746ef 100644 --- a/pkg/transformers/json_stringify.go +++ b/pkg/transformers/json_stringify.go @@ -82,7 +82,7 @@ func transformerJSONStringifyParseCLI( } } - var jsonFormatting mlrval.TJSONFormatting = mlrval.JSON_SINGLE_LINE + var jsonFormatting mlrval.TJSONFormatting if jvStack { jsonFormatting = mlrval.JSON_MULTILINE } else { diff --git a/pkg/transformers/label.go b/pkg/transformers/label.go index 3113cd449..b12d80964 100644 --- a/pkg/transformers/label.go +++ b/pkg/transformers/label.go @@ -52,7 +52,6 @@ func transformerLabelParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerLabelUsage(os.Stdout) diff --git a/pkg/transformers/latin1_to_utf8.go b/pkg/transformers/latin1_to_utf8.go index 30befec45..2f49795f2 100644 --- a/pkg/transformers/latin1_to_utf8.go +++ b/pkg/transformers/latin1_to_utf8.go @@ -50,7 +50,6 @@ func transformerLatin1ToUTF8ParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerLatin1ToUTF8Usage(os.Stdout) diff --git a/pkg/transformers/nest.go b/pkg/transformers/nest.go index ce255ecfc..284eb865b 100644 --- a/pkg/transformers/nest.go +++ b/pkg/transformers/nest.go @@ -645,8 +645,7 @@ func (tr *TransformerNest) implodeValueAcrossRecords( } otherValuesJoined := inrec.GetValuesJoinedExcept(originalEntry) - var bucket *tNestBucket = nil - bucket = otherValuesToBuckets.Get(otherValuesJoined) + bucket := otherValuesToBuckets.Get(otherValuesJoined) if bucket == nil { bucket = newNestBucket(inrec) otherValuesToBuckets.Put(otherValuesJoined, bucket) diff --git a/pkg/transformers/nothing.go b/pkg/transformers/nothing.go index 460f25f2f..6c04a017b 100644 --- a/pkg/transformers/nothing.go +++ b/pkg/transformers/nothing.go @@ -48,7 +48,6 @@ func transformerNothingParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerNothingUsage(os.Stdout) diff --git a/pkg/transformers/regularize.go b/pkg/transformers/regularize.go index 61ca19ee0..9b781e10a 100644 --- a/pkg/transformers/regularize.go +++ b/pkg/transformers/regularize.go @@ -49,7 +49,6 @@ func transformerRegularizeParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerRegularizeUsage(os.Stdout) diff --git a/pkg/transformers/remove_empty_columns.go b/pkg/transformers/remove_empty_columns.go index c148358df..8e89e00f3 100644 --- a/pkg/transformers/remove_empty_columns.go +++ b/pkg/transformers/remove_empty_columns.go @@ -48,7 +48,6 @@ func transformerRemoveEmptyColumnsParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerRemoveEmptyColumnsUsage(os.Stdout) diff --git a/pkg/transformers/reshape.go b/pkg/transformers/reshape.go index e72657599..f145e9bfc 100644 --- a/pkg/transformers/reshape.go +++ b/pkg/transformers/reshape.go @@ -411,8 +411,7 @@ func (tr *TransformerReshape) longToWide( } otherValuesJoined := inrec.GetValuesJoined() - var bucket *tReshapeBucket = nil - bucket = otherValuesToBuckets.Get(otherValuesJoined) + bucket := otherValuesToBuckets.Get(otherValuesJoined) if bucket == nil { bucket = newReshapeBucket(inrec) otherValuesToBuckets.Put(otherValuesJoined, bucket) diff --git a/pkg/transformers/sec2gmtdate.go b/pkg/transformers/sec2gmtdate.go index 77c50bf23..6bec51aae 100644 --- a/pkg/transformers/sec2gmtdate.go +++ b/pkg/transformers/sec2gmtdate.go @@ -51,7 +51,6 @@ func transformerSec2GMTDateParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerSec2GMTDateUsage(os.Stdout) diff --git a/pkg/transformers/seqgen.go b/pkg/transformers/seqgen.go index b7a5b0f58..9437c22e8 100644 --- a/pkg/transformers/seqgen.go +++ b/pkg/transformers/seqgen.go @@ -138,7 +138,7 @@ func NewTransformerSeqgen( start := mlrval.FromInferredType(startString) stop := mlrval.FromInferredType(stopString) step := mlrval.FromInferredType(stepString) - var doneComparator bifs.BinaryFunc = nil + var doneComparator bifs.BinaryFunc fstart, startIsNumeric := start.GetNumericToFloatValue() if !startIsNumeric { diff --git a/pkg/transformers/shuffle.go b/pkg/transformers/shuffle.go index 688230fb4..4e7a502b2 100644 --- a/pkg/transformers/shuffle.go +++ b/pkg/transformers/shuffle.go @@ -51,7 +51,6 @@ func transformerShuffleParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerShuffleUsage(os.Stdout) diff --git a/pkg/transformers/skip_trivial_records.go b/pkg/transformers/skip_trivial_records.go index e8ddd1fe5..a1ad2c5f0 100644 --- a/pkg/transformers/skip_trivial_records.go +++ b/pkg/transformers/skip_trivial_records.go @@ -48,7 +48,6 @@ func transformerSkipTrivialRecordsParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerSkipTrivialRecordsUsage(os.Stdout) diff --git a/pkg/transformers/tac.go b/pkg/transformers/tac.go index 237d8a23a..e525244d1 100644 --- a/pkg/transformers/tac.go +++ b/pkg/transformers/tac.go @@ -47,7 +47,6 @@ func transformerTacParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerTacUsage(os.Stdout) diff --git a/pkg/transformers/tee.go b/pkg/transformers/tee.go index e76acba49..9bf412944 100644 --- a/pkg/transformers/tee.go +++ b/pkg/transformers/tee.go @@ -136,9 +136,9 @@ func NewTransformerTee( filenameOrCommand string, recordWriterOptions *cli.TWriterOptions, ) (*TransformerTee, error) { - var fileOutputHandler *output.FileOutputHandler = nil + var fileOutputHandler *output.FileOutputHandler var err error - filenameOrCommandForDisplay := filenameOrCommand + var filenameOrCommandForDisplay string if piping { fileOutputHandler, err = output.NewPipeWriteOutputHandler(filenameOrCommand, recordWriterOptions) filenameOrCommandForDisplay = "| " + filenameOrCommand diff --git a/pkg/transformers/utf8_to_latin1.go b/pkg/transformers/utf8_to_latin1.go index fbeebe383..cdd6b5a7f 100644 --- a/pkg/transformers/utf8_to_latin1.go +++ b/pkg/transformers/utf8_to_latin1.go @@ -50,7 +50,6 @@ func transformerUTF8ToLatin1ParseCLI( if args[argi] == "--" { break // All transformers must do this so main-flags can follow verb-flags } - argi++ if opt == "-h" || opt == "--help" { transformerUTF8ToLatin1Usage(os.Stdout)