From 31d6164181710d28aa7571a769789c54ef8162cb Mon Sep 17 00:00:00 2001 From: John Kerl Date: Sat, 5 Oct 2024 09:25:47 -0400 Subject: [PATCH] Fix 1668 error-source (#1672) * Fix 1668 error-source * run `make dev` --- docs/src/manpage.md | 8 ++++---- docs/src/manpage.txt | 8 ++++---- man/manpage.txt | 8 ++++---- man/mlr.1 | 10 +++++----- pkg/transformers/rename.go | 6 +++--- test/cases/cli-help/0001/expout | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/src/manpage.md b/docs/src/manpage.md index a2023eb06..f3b547cc6 100644 --- a/docs/src/manpage.md +++ b/docs/src/manpage.md @@ -1644,9 +1644,9 @@ This is simply a copy of what you should see on running `man mlr` at a command p first-match replacement. -h|--help Show this message. Examples: - mlr rename old_name,new_name' - mlr rename old_name_1,new_name_1,old_name_2,new_name_2' - mlr rename -r 'Date_[0-9]+,Date,' Rename all such fields to be "Date" + mlr rename old_name,new_name + mlr rename old_name_1,new_name_1,old_name_2,new_name_2 + mlr rename -r 'Date_[0-9]+,Date' Rename all such fields to be "Date" mlr rename -r '"Date_[0-9]+",Date' Same mlr rename -r 'Date_([0-9]+).*,\1' Rename all such fields to be of the form 20151015 mlr rename -r '"name"i,Name' Rename "name", "Name", "NAME", etc. to "Name" @@ -3731,5 +3731,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 - 2024-10-02 4mMILLER24m(1) + 2024-10-05 4mMILLER24m(1) diff --git a/docs/src/manpage.txt b/docs/src/manpage.txt index ac120d642..4c56ec513 100644 --- a/docs/src/manpage.txt +++ b/docs/src/manpage.txt @@ -1623,9 +1623,9 @@ first-match replacement. -h|--help Show this message. Examples: - mlr rename old_name,new_name' - mlr rename old_name_1,new_name_1,old_name_2,new_name_2' - mlr rename -r 'Date_[0-9]+,Date,' Rename all such fields to be "Date" + mlr rename old_name,new_name + mlr rename old_name_1,new_name_1,old_name_2,new_name_2 + mlr rename -r 'Date_[0-9]+,Date' Rename all such fields to be "Date" mlr rename -r '"Date_[0-9]+",Date' Same mlr rename -r 'Date_([0-9]+).*,\1' Rename all such fields to be of the form 20151015 mlr rename -r '"name"i,Name' Rename "name", "Name", "NAME", etc. to "Name" @@ -3710,4 +3710,4 @@ MIME Type for Comma-Separated Values (CSV) Files, the Miller docsite https://miller.readthedocs.io - 2024-10-02 4mMILLER24m(1) + 2024-10-05 4mMILLER24m(1) diff --git a/man/manpage.txt b/man/manpage.txt index ac120d642..4c56ec513 100644 --- a/man/manpage.txt +++ b/man/manpage.txt @@ -1623,9 +1623,9 @@ first-match replacement. -h|--help Show this message. Examples: - mlr rename old_name,new_name' - mlr rename old_name_1,new_name_1,old_name_2,new_name_2' - mlr rename -r 'Date_[0-9]+,Date,' Rename all such fields to be "Date" + mlr rename old_name,new_name + mlr rename old_name_1,new_name_1,old_name_2,new_name_2 + mlr rename -r 'Date_[0-9]+,Date' Rename all such fields to be "Date" mlr rename -r '"Date_[0-9]+",Date' Same mlr rename -r 'Date_([0-9]+).*,\1' Rename all such fields to be of the form 20151015 mlr rename -r '"name"i,Name' Rename "name", "Name", "NAME", etc. to "Name" @@ -3710,4 +3710,4 @@ MIME Type for Comma-Separated Values (CSV) Files, the Miller docsite https://miller.readthedocs.io - 2024-10-02 4mMILLER24m(1) + 2024-10-05 4mMILLER24m(1) diff --git a/man/mlr.1 b/man/mlr.1 index 0c0be4c56..46b85a18d 100644 --- a/man/mlr.1 +++ b/man/mlr.1 @@ -2,12 +2,12 @@ .\" Title: mlr .\" Author: [see the "AUTHOR" section] .\" Generator: ./mkman.rb -.\" Date: 2024-10-02 +.\" Date: 2024-10-05 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MILLER" "1" "2024-10-02" "\ \&" "\ \&" +.TH "MILLER" "1" "2024-10-05" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Portability definitions .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -2036,9 +2036,9 @@ Options: first-match replacement. -h|--help Show this message. Examples: -mlr rename old_name,new_name' -mlr rename old_name_1,new_name_1,old_name_2,new_name_2' -mlr rename -r 'Date_[0-9]+,Date,' Rename all such fields to be "Date" +mlr rename old_name,new_name +mlr rename old_name_1,new_name_1,old_name_2,new_name_2 +mlr rename -r 'Date_[0-9]+,Date' Rename all such fields to be "Date" mlr rename -r '"Date_[0-9]+",Date' Same mlr rename -r 'Date_([0-9]+).*,\e1' Rename all such fields to be of the form 20151015 mlr rename -r '"name"i,Name' Rename "name", "Name", "NAME", etc. to "Name" diff --git a/pkg/transformers/rename.go b/pkg/transformers/rename.go index d7adef13f..39f252827 100644 --- a/pkg/transformers/rename.go +++ b/pkg/transformers/rename.go @@ -43,9 +43,9 @@ func transformerRenameUsage( fmt.Fprintf(o, " first-match replacement.\n") fmt.Fprintf(o, "-h|--help Show this message.\n") fmt.Fprintf(o, "Examples:\n") - fmt.Fprintf(o, "%s %s old_name,new_name'\n", exeName, verb) - fmt.Fprintf(o, "%s %s old_name_1,new_name_1,old_name_2,new_name_2'\n", exeName, verb) - fmt.Fprintf(o, "%s %s -r 'Date_[0-9]+,Date,' Rename all such fields to be \"Date\"\n", exeName, verb) + fmt.Fprintf(o, "%s %s old_name,new_name\n", exeName, verb) + fmt.Fprintf(o, "%s %s old_name_1,new_name_1,old_name_2,new_name_2\n", exeName, verb) + fmt.Fprintf(o, "%s %s -r 'Date_[0-9]+,Date' Rename all such fields to be \"Date\"\n", exeName, verb) fmt.Fprintf(o, "%s %s -r '\"Date_[0-9]+\",Date' Same\n", exeName, verb) fmt.Fprintf(o, "%s %s -r 'Date_([0-9]+).*,\\1' Rename all such fields to be of the form 20151015\n", exeName, verb) fmt.Fprintf(o, "%s %s -r '\"name\"i,Name' Rename \"name\", \"Name\", \"NAME\", etc. to \"Name\"\n", exeName, verb) diff --git a/test/cases/cli-help/0001/expout b/test/cases/cli-help/0001/expout index 57a9746ee..411318a64 100644 --- a/test/cases/cli-help/0001/expout +++ b/test/cases/cli-help/0001/expout @@ -778,9 +778,9 @@ Options: first-match replacement. -h|--help Show this message. Examples: -mlr rename old_name,new_name' -mlr rename old_name_1,new_name_1,old_name_2,new_name_2' -mlr rename -r 'Date_[0-9]+,Date,' Rename all such fields to be "Date" +mlr rename old_name,new_name +mlr rename old_name_1,new_name_1,old_name_2,new_name_2 +mlr rename -r 'Date_[0-9]+,Date' Rename all such fields to be "Date" mlr rename -r '"Date_[0-9]+",Date' Same mlr rename -r 'Date_([0-9]+).*,\1' Rename all such fields to be of the form 20151015 mlr rename -r '"name"i,Name' Rename "name", "Name", "NAME", etc. to "Name"