1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00

refactor/polish ~ re-normalize whitespace

* minimize inconsistent/invisible whitespace

- consistent indentation (either spaces-only, tabs, *or* tabs with following spaces [for indentation])
- no internal/invisible tabs
- no trailing whitespace
- EOF EOLNs
This commit is contained in:
Roy Ivy III 2022-01-01 18:05:10 -06:00
parent bb25129a48
commit 7a760cae99
7 changed files with 16 additions and 16 deletions

View file

@ -47,12 +47,12 @@ BUSYBOX_VER := 1.32.1
BUSYBOX_SRC := $(BUSYBOX_ROOT)/busybox-$(BUSYBOX_VER) BUSYBOX_SRC := $(BUSYBOX_ROOT)/busybox-$(BUSYBOX_VER)
ifeq ($(SELINUX_ENABLED),) ifeq ($(SELINUX_ENABLED),)
SELINUX_ENABLED := 0 SELINUX_ENABLED := 0
ifneq ($(OS),Windows_NT) ifneq ($(OS),Windows_NT)
ifeq ($(shell /sbin/selinuxenabled 2>/dev/null ; echo $$?),0) ifeq ($(shell /sbin/selinuxenabled 2>/dev/null ; echo $$?),0)
SELINUX_ENABLED := 1 SELINUX_ENABLED := 1
endif endif
endif endif
endif endif
# Possible programs # Possible programs
@ -161,11 +161,11 @@ SELINUX_PROGS := \
runcon runcon
ifneq ($(OS),Windows_NT) ifneq ($(OS),Windows_NT)
PROGS := $(PROGS) $(UNIX_PROGS) PROGS := $(PROGS) $(UNIX_PROGS)
endif endif
ifeq ($(SELINUX_ENABLED),1) ifeq ($(SELINUX_ENABLED),1)
PROGS := $(PROGS) $(SELINUX_PROGS) PROGS := $(PROGS) $(SELINUX_PROGS)
endif endif
UTILS ?= $(PROGS) UTILS ?= $(PROGS)

View file

@ -20,7 +20,7 @@ and most other parts of the world.
This particular file has about 170,000 lines, each of which is no longer This particular file has about 170,000 lines, each of which is no longer
than 96 characters: than 96 characters:
$ wc -lL shakespeare.txt $ wc -lL shakespeare.txt
170592 96 shakespeare.txt 170592 96 shakespeare.txt
You could use files of different shapes and sizes to test the You could use files of different shapes and sizes to test the

View file

@ -29,4 +29,4 @@ name = "nl"
path = "src/main.rs" path = "src/main.rs"
[package.metadata.cargo-udeps.ignore] [package.metadata.cargo-udeps.ignore]
normal = ["uucore_procs"] normal = ["uucore_procs"]

View file

@ -24,4 +24,4 @@ name = "numfmt"
path = "src/main.rs" path = "src/main.rs"
[package.metadata.cargo-udeps.ignore] [package.metadata.cargo-udeps.ignore]
normal = ["uucore_procs"] normal = ["uucore_procs"]

View file

@ -217,7 +217,7 @@ pub fn uu_app() -> App<'static, 'static> {
// This is solely for testing. // This is solely for testing.
// Do not document. // Do not document.
// It is relatively difficult to ensure that there is a tty on stdin. // It is relatively difficult to ensure that there is a tty on stdin.
// Since rm acts differently depending on that, without this option, // Since rm acts differently depending on that, without this option,
// it'd be harder to test the parts of rm that depend on that setting. // it'd be harder to test the parts of rm that depend on that setting.
.arg( .arg(
Arg::with_name(PRESUME_INPUT_TTY) Arg::with_name(PRESUME_INPUT_TTY)

View file

@ -56,7 +56,7 @@
//! .get_matches_from(vec![ //! .get_matches_from(vec![
//! "app", "--backup=t", "--suffix=bak~" //! "app", "--backup=t", "--suffix=bak~"
//! ]); //! ]);
//! //!
//! let backup_mode = match backup_control::determine_backup_mode(&matches) { //! let backup_mode = match backup_control::determine_backup_mode(&matches) {
//! Err(e) => { //! Err(e) => {
//! show!(e); //! show!(e);
@ -321,7 +321,7 @@ pub fn determine_backup_suffix(matches: &ArgMatches) -> String {
/// .get_matches_from(vec![ /// .get_matches_from(vec![
/// "app", "-b", "--backup=n" /// "app", "-b", "--backup=n"
/// ]); /// ]);
/// ///
/// let backup_mode = backup_control::determine_backup_mode(&matches); /// let backup_mode = backup_control::determine_backup_mode(&matches);
/// ///
/// assert!(backup_mode.is_err()); /// assert!(backup_mode.is_err());

View file

@ -340,10 +340,10 @@ fn test_dictionary_order() {
fn test_dictionary_order2() { fn test_dictionary_order2() {
for non_dictionary_order2_param in &["-d"] { for non_dictionary_order2_param in &["-d"] {
new_ucmd!() new_ucmd!()
.pipe_in("a👦🏻aa b\naaaa b") // spell-checker:disable-line .pipe_in("a👦🏻aa\tb\naaaa\tb") // spell-checker:disable-line
.arg(non_dictionary_order2_param) // spell-checker:disable-line .arg(non_dictionary_order2_param) // spell-checker:disable-line
.succeeds() .succeeds()
.stdout_only("a👦🏻aa b\naaaa b\n"); // spell-checker:disable-line .stdout_only("a👦🏻aa\tb\naaaa\tb\n"); // spell-checker:disable-line
} }
} }