Skip to content

ls: Refactored options and other long constants to fix formatting#2436

Merged
sylvestre merged 1 commit intouutils:masterfrom
hbina:hbina-ls-refactor-options-module
Jul 4, 2021
Merged

ls: Refactored options and other long constants to fix formatting#2436
sylvestre merged 1 commit intouutils:masterfrom
hbina:hbina-ls-refactor-options-module

Conversation

@hbina
Copy link
Contributor

@hbina hbina commented Jun 19, 2021

Only refactors the options module and a bunch of long strings as opposed to full refactor here #2434

Signed-off-by: Hanif Bin Ariffin hanif.ariffin.4326@gmail.com

@hbina hbina mentioned this pull request Jun 19, 2021
@hbina
Copy link
Contributor Author

hbina commented Jun 20, 2021

Any idea how do I see the full report for this run here? https://github.com/uutils/coreutils/pull/2436/checks?check_run_id=2864586345

I can't expand the error ones. @sylvestre

@sylvestre
Copy link
Contributor

I can't see it either. I re-triggered the run

@sylvestre
Copy link
Contributor

could you please fix the conflict? thanks

@hbina hbina force-pushed the hbina-ls-refactor-options-module branch from 1ca2325 to 4b5e7f9 Compare June 27, 2021 00:38
@sylvestre
Copy link
Contributor

sorry but it is still conflicting

Signed-off-by: Hanif Bin Ariffin <hanif.ariffin.4326@gmail.com>

Keep one of the texts in-place

Signed-off-by: Hanif Bin Ariffin <hanif.ariffin.4326@gmail.com>

Reduced the fix to just formatting changes

Signed-off-by: Hanif Bin Ariffin <hanif.ariffin.4326@gmail.com>
@hbina hbina force-pushed the hbina-ls-refactor-options-module branch from 4b5e7f9 to 4778a64 Compare June 27, 2021 06:57
@hbina
Copy link
Contributor Author

hbina commented Jun 27, 2021

Rebased again.

Comment on lines -48 to -55
static ABOUT: &str = "
By default, ls will list the files and contents of any directories on
the command line, expect that it will ignore files and directories
whose names start with '.'
";
static AFTER_HELP: &str = "The TIME_STYLE argument can be full-iso, long-iso, iso.
Also the TIME_STYLE environment variable sets the default style to use.";

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you moving these?

The current form follows the pattern of other utils, so it should remain unless you have some reason to move them.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In addition to @rivy's comment, we can consider moving those constants under our mod options but yeah please don't break the consistency for now.

pub mod options {
    pub mod help {
        pub static HELP: &str = "help";
    }
}

@rivy
Copy link
Contributor

rivy commented Jun 27, 2021

Technical nit... use present tense for the commit message please.

@sylvestre sylvestre merged commit e4204fc into uutils:master Jul 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants