From 3f35e0a4218521c37f21f49007befc175c402767 Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Sun, 30 May 2021 22:55:28 -0500 Subject: [PATCH] refactor ~ `cargo make format` --- src/uu/od/src/prn_int.rs | 5 +++- .../src/tokenize/num_format/formatter.rs | 1 - .../formatters/cninetyninehexfloatf.rs | 15 +++++++++--- .../tokenize/num_format/formatters/decf.rs | 12 ++++++---- .../num_format/formatters/float_common.rs | 4 +++- .../tokenize/num_format/formatters/floatf.rs | 9 +++++-- .../tokenize/num_format/formatters/intf.rs | 7 +++++- src/uu/stat/src/stat.rs | 22 ++++++++++------- src/uucore/src/lib/features/fsext.rs | 4 ++-- tests/benches/factor/benches/table.rs | 2 +- tests/by-util/test_base64.rs | 4 ++-- tests/by-util/test_cat.rs | 12 +++++----- tests/by-util/test_comm.rs | 2 +- tests/by-util/test_date.rs | 2 +- tests/by-util/test_dircolors.rs | 4 ++-- tests/by-util/test_echo.rs | 2 +- tests/by-util/test_factor.rs | 5 +++- tests/by-util/test_fold.rs | 8 +++---- tests/by-util/test_kill.rs | 2 +- tests/by-util/test_ln.rs | 2 +- tests/by-util/test_ls.rs | 2 +- tests/by-util/test_mktemp.rs | 4 ++-- tests/by-util/test_more.rs | 6 +++-- tests/by-util/test_mv.rs | 2 +- tests/by-util/test_nice.rs | 2 +- tests/by-util/test_od.rs | 24 +++++++++---------- tests/by-util/test_pinky.rs | 6 ++--- tests/by-util/test_printf.rs | 8 +++---- tests/by-util/test_relpath.rs | 4 ++-- tests/by-util/test_rm.rs | 2 +- tests/by-util/test_sort.rs | 12 +++++----- tests/by-util/test_stat.rs | 6 ++--- tests/by-util/test_tail.rs | 2 +- tests/by-util/test_test.rs | 2 +- tests/by-util/test_tr.rs | 16 ++++++------- tests/by-util/test_truncate.rs | 7 +----- 36 files changed, 129 insertions(+), 100 deletions(-) diff --git a/src/uu/od/src/prn_int.rs b/src/uu/od/src/prn_int.rs index 5e31da9dd..0946824c1 100644 --- a/src/uu/od/src/prn_int.rs +++ b/src/uu/od/src/prn_int.rs @@ -153,7 +153,10 @@ fn test_format_item_hex() { assert_eq!(" 00000000", format_item_hex32(0)); assert_eq!(" ffffffff", format_item_hex32(0xffff_ffff)); assert_eq!(" 0000000000000000", format_item_hex64(0)); - assert_eq!(" ffffffffffffffff", format_item_hex64(0xffff_ffff_ffff_ffff)); + assert_eq!( + " ffffffffffffffff", + format_item_hex64(0xffff_ffff_ffff_ffff) + ); } #[test] diff --git a/src/uu/printf/src/tokenize/num_format/formatter.rs b/src/uu/printf/src/tokenize/num_format/formatter.rs index 9fd5954ed..f5f5d71b1 100644 --- a/src/uu/printf/src/tokenize/num_format/formatter.rs +++ b/src/uu/printf/src/tokenize/num_format/formatter.rs @@ -1,4 +1,3 @@ - //! Primitives used by num_format and sub_modules. //! never dealt with above (e.g. Sub Tokenizer never uses these) diff --git a/src/uu/printf/src/tokenize/num_format/formatters/cninetyninehexfloatf.rs b/src/uu/printf/src/tokenize/num_format/formatters/cninetyninehexfloatf.rs index 104e55ef3..f96a991b5 100644 --- a/src/uu/printf/src/tokenize/num_format/formatters/cninetyninehexfloatf.rs +++ b/src/uu/printf/src/tokenize/num_format/formatters/cninetyninehexfloatf.rs @@ -25,8 +25,13 @@ impl Formatter for CninetyNineHexFloatf { str_in: &str, ) -> Option { let second_field = field.second_field.unwrap_or(6) + 1; - let analysis = - FloatAnalysis::analyze(&str_in, initial_prefix, Some(second_field as usize), None, true); + let analysis = FloatAnalysis::analyze( + &str_in, + initial_prefix, + Some(second_field as usize), + None, + true, + ); let f = get_primitive_hex( initial_prefix, &str_in[initial_prefix.offset..], @@ -51,7 +56,11 @@ fn get_primitive_hex( _last_dec_place: usize, capitalized: bool, ) -> FormatPrimitive { - let prefix = Some(String::from(if initial_prefix.sign == -1 { "-0x" } else { "0x" })); + let prefix = Some(String::from(if initial_prefix.sign == -1 { + "-0x" + } else { + "0x" + })); // TODO actual conversion, make sure to get back mantissa. // for hex to hex, it's really just a matter of moving the diff --git a/src/uu/printf/src/tokenize/num_format/formatters/decf.rs b/src/uu/printf/src/tokenize/num_format/formatters/decf.rs index 4d729f0ce..5798eadcb 100644 --- a/src/uu/printf/src/tokenize/num_format/formatters/decf.rs +++ b/src/uu/printf/src/tokenize/num_format/formatters/decf.rs @@ -76,11 +76,13 @@ impl Formatter for Decf { second_field as usize, None, ); - Some(if get_len_fmt_primitive(&f_fl) >= get_len_fmt_primitive(&f_sci) { - f_sci - } else { - f_fl - }) + Some( + if get_len_fmt_primitive(&f_fl) >= get_len_fmt_primitive(&f_sci) { + f_sci + } else { + f_fl + }, + ) } fn primitive_to_str(&self, prim: &FormatPrimitive, field: FormatField) -> String { primitive_to_str_common(prim, &field) diff --git a/src/uu/printf/src/tokenize/num_format/formatters/float_common.rs b/src/uu/printf/src/tokenize/num_format/formatters/float_common.rs index 4cbb496e4..dd8259233 100644 --- a/src/uu/printf/src/tokenize/num_format/formatters/float_common.rs +++ b/src/uu/printf/src/tokenize/num_format/formatters/float_common.rs @@ -2,7 +2,9 @@ // spell-checker:ignore (ToDO) arrnum use super::super::format_field::FormatField; -use super::super::formatter::{get_it_at, warn_incomplete_conv, Base, FormatPrimitive, InitialPrefix}; +use super::super::formatter::{ + get_it_at, warn_incomplete_conv, Base, FormatPrimitive, InitialPrefix, +}; use super::base_conv; use super::base_conv::RadixDef; diff --git a/src/uu/printf/src/tokenize/num_format/formatters/floatf.rs b/src/uu/printf/src/tokenize/num_format/formatters/floatf.rs index 79bb51fb8..aed50f18e 100644 --- a/src/uu/printf/src/tokenize/num_format/formatters/floatf.rs +++ b/src/uu/printf/src/tokenize/num_format/formatters/floatf.rs @@ -20,8 +20,13 @@ impl Formatter for Floatf { str_in: &str, ) -> Option { let second_field = field.second_field.unwrap_or(6) + 1; - let analysis = - FloatAnalysis::analyze(&str_in, initial_prefix, None, Some(second_field as usize), false); + let analysis = FloatAnalysis::analyze( + &str_in, + initial_prefix, + None, + Some(second_field as usize), + false, + ); let f = get_primitive_dec( initial_prefix, &str_in[initial_prefix.offset..], diff --git a/src/uu/printf/src/tokenize/num_format/formatters/intf.rs b/src/uu/printf/src/tokenize/num_format/formatters/intf.rs index 1e9e25560..02c59211b 100644 --- a/src/uu/printf/src/tokenize/num_format/formatters/intf.rs +++ b/src/uu/printf/src/tokenize/num_format/formatters/intf.rs @@ -150,7 +150,12 @@ impl Intf { // - if the string falls outside bounds: // for i64 output, the int minimum or int max (depending on sign) // for u64 output, the u64 max in the output radix - fn conv_from_segment(segment: &str, radix_in: Base, field_char: char, sign: i8) -> FormatPrimitive { + fn conv_from_segment( + segment: &str, + radix_in: Base, + field_char: char, + sign: i8, + ) -> FormatPrimitive { match field_char { 'i' | 'd' => match i64::from_str_radix(segment, radix_in as u32) { Ok(i) => { diff --git a/src/uu/stat/src/stat.rs b/src/uu/stat/src/stat.rs index 83567e447..403134b4b 100644 --- a/src/uu/stat/src/stat.rs +++ b/src/uu/stat/src/stat.rs @@ -475,12 +475,14 @@ impl Stater { let show_fs = matches.is_present(options::FILE_SYSTEM); let default_tokens = if format_str.is_empty() { - Stater::generate_tokens(&Stater::default_format(show_fs, terse, false), use_printf).unwrap() + Stater::generate_tokens(&Stater::default_format(show_fs, terse, false), use_printf) + .unwrap() } else { Stater::generate_tokens(&format_str, use_printf)? }; let default_dev_tokens = - Stater::generate_tokens(&Stater::default_format(show_fs, terse, true), use_printf).unwrap(); + Stater::generate_tokens(&Stater::default_format(show_fs, terse, true), use_printf) + .unwrap(); let mount_list = if show_fs { // mount points aren't displayed when showing filesystem information @@ -540,12 +542,13 @@ impl Stater { match result { Ok(meta) => { let file_type = meta.file_type(); - let tokens = - if self.from_user || !(file_type.is_char_device() || file_type.is_block_device()) { - &self.default_tokens - } else { - &self.default_dev_tokens - }; + let tokens = if self.from_user + || !(file_type.is_char_device() || file_type.is_block_device()) + { + &self.default_tokens + } else { + &self.default_dev_tokens + }; for t in tokens.iter() { match *t { @@ -867,7 +870,8 @@ impl Stater { } else { format_str.push_str(" File: %N\n Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"); if show_dev_type { - format_str.push_str("Device: %Dh/%dd\tInode: %-10i Links: %-5h Device type: %t,%T\n"); + format_str + .push_str("Device: %Dh/%dd\tInode: %-10i Links: %-5h Device type: %t,%T\n"); } else { format_str.push_str("Device: %Dh/%dd\tInode: %-10i Links: %h\n"); } diff --git a/src/uucore/src/lib/features/fsext.rs b/src/uucore/src/lib/features/fsext.rs index e1cb67097..d3eec468a 100644 --- a/src/uucore/src/lib/features/fsext.rs +++ b/src/uucore/src/lib/features/fsext.rs @@ -612,12 +612,12 @@ impl FsMeta for StatFs { } #[cfg(target_os = "freebsd")] fn namelen(&self) -> u64 { - self.f_namemax as u64 // spell-checker:disable-line + self.f_namemax as u64 // spell-checker:disable-line } // XXX: should everything just use statvfs? #[cfg(not(any(target_vendor = "apple", target_os = "freebsd", target_os = "linux")))] fn namelen(&self) -> u64 { - self.f_namemax as u64 // spell-checker:disable-line + self.f_namemax as u64 // spell-checker:disable-line } } diff --git a/tests/benches/factor/benches/table.rs b/tests/benches/factor/benches/table.rs index d8859d940..9090c7d51 100644 --- a/tests/benches/factor/benches/table.rs +++ b/tests/benches/factor/benches/table.rs @@ -18,7 +18,7 @@ fn table(c: &mut Criterion) { // Deterministic RNG; use an explicitly-named RNG to guarantee stability use rand::{RngCore, SeedableRng}; use rand_chacha::ChaCha8Rng; - const SEED: u64 = 0xdead_bebe_ea75_cafe; // spell-checker:disable-line + const SEED: u64 = 0xdead_bebe_ea75_cafe; // spell-checker:disable-line let mut rng = ChaCha8Rng::seed_from_u64(SEED); std::iter::repeat_with(move || array_init::<_, _, INPUT_SIZE>(|_| rng.next_u64())) diff --git a/tests/by-util/test_base64.rs b/tests/by-util/test_base64.rs index 459845ccf..236f53fb1 100644 --- a/tests/by-util/test_base64.rs +++ b/tests/by-util/test_base64.rs @@ -38,7 +38,7 @@ fn test_decode() { #[test] fn test_garbage() { - let input = "aGVsbG8sIHdvcmxkIQ==\0"; // spell-checker:disable-line + let input = "aGVsbG8sIHdvcmxkIQ==\0"; // spell-checker:disable-line new_ucmd!() .arg("-d") .pipe_in(input) @@ -49,7 +49,7 @@ fn test_garbage() { #[test] fn test_ignore_garbage() { for ignore_garbage_param in &["-i", "--ignore-garbage"] { - let input = "aGVsbG8sIHdvcmxkIQ==\0"; // spell-checker:disable-line + let input = "aGVsbG8sIHdvcmxkIQ==\0"; // spell-checker:disable-line new_ucmd!() .arg("-d") .arg(ignore_garbage_param) diff --git a/tests/by-util/test_cat.rs b/tests/by-util/test_cat.rs index b00c58dc1..fadf378ab 100644 --- a/tests/by-util/test_cat.rs +++ b/tests/by-util/test_cat.rs @@ -9,7 +9,7 @@ fn test_output_simple() { new_ucmd!() .args(&["alpha.txt"]) .succeeds() - .stdout_only("abcde\nfghij\nklmno\npqrst\nuvwxyz\n"); // spell-checker:disable-line + .stdout_only("abcde\nfghij\nklmno\npqrst\nuvwxyz\n"); // spell-checker:disable-line } #[test] @@ -67,8 +67,8 @@ fn test_fifo_symlink() { assert!(s.fixtures.is_fifo("dir/pipe")); // Make cat read the pipe through a symlink - s.fixtures.symlink_file("dir/pipe", "sympipe"); // spell-checker:disable-line - let proc = s.ucmd().args(&["sympipe"]).run_no_wait(); // spell-checker:disable-line + s.fixtures.symlink_file("dir/pipe", "sympipe"); // spell-checker:disable-line + let proc = s.ucmd().args(&["sympipe"]).run_no_wait(); // spell-checker:disable-line let data = vec_of_size(128 * 1024); let data2 = data.clone(); @@ -111,7 +111,7 @@ fn test_piped_to_regular_file() { .succeeds(); } let contents = read_to_string(&file_path).unwrap(); - assert_eq!(contents, "abcde\nfghij\nklmno\npqrst\nuvwxyz\n"); // spell-checker:disable-line + assert_eq!(contents, "abcde\nfghij\nklmno\npqrst\nuvwxyz\n"); // spell-checker:disable-line } } @@ -193,7 +193,7 @@ fn test_three_directories_and_file_and_stdin() { "alpha.txt", "-", "file_which_does_not_exist.txt", - "nonewline.txt", // spell-checker:disable-line + "nonewline.txt", // spell-checker:disable-line "test_directory3/test_directory5", "test_directory3/../test_directory3/test_directory5", "test_directory3", @@ -202,7 +202,7 @@ fn test_three_directories_and_file_and_stdin() { .fails() .stderr_is_fixture("three_directories_and_file_and_stdin.stderr.expected") .stdout_is( - "abcde\nfghij\nklmno\npqrst\nuvwxyz\nstdout bytestext without a trailing newline", // spell-checker:disable-line + "abcde\nfghij\nklmno\npqrst\nuvwxyz\nstdout bytestext without a trailing newline", // spell-checker:disable-line ); } diff --git a/tests/by-util/test_comm.rs b/tests/by-util/test_comm.rs index ba26f6819..01cdcc985 100644 --- a/tests/by-util/test_comm.rs +++ b/tests/by-util/test_comm.rs @@ -39,7 +39,7 @@ fn a_empty() { new_ucmd!() .args(&["a", "empty"]) .succeeds() - .stdout_only_fixture("aempty.expected"); // spell-checker:disable-line + .stdout_only_fixture("aempty.expected"); // spell-checker:disable-line } #[test] diff --git a/tests/by-util/test_date.rs b/tests/by-util/test_date.rs index 9689ff49e..72747fa66 100644 --- a/tests/by-util/test_date.rs +++ b/tests/by-util/test_date.rs @@ -181,7 +181,7 @@ fn test_date_set_valid_2() { if get_effective_uid() == 0 { let result = new_ucmd!() .arg("--set") - .arg("Sat 20 Mar 2021 14:53:01 AWST") // spell-checker:disable-line + .arg("Sat 20 Mar 2021 14:53:01 AWST") // spell-checker:disable-line .fails(); result.no_stdout(); assert!(result.stderr_str().starts_with("date: invalid date ")); diff --git a/tests/by-util/test_dircolors.rs b/tests/by-util/test_dircolors.rs index 86b72d23b..fac4161f3 100644 --- a/tests/by-util/test_dircolors.rs +++ b/tests/by-util/test_dircolors.rs @@ -35,9 +35,9 @@ fn test_str_utils() { assert_eq!("asd#zcv", s.purify()); let s = "con256asd"; - assert!(s.fnmatch("*[2][3-6][5-9]?sd")); // spell-checker:disable-line + assert!(s.fnmatch("*[2][3-6][5-9]?sd")); // spell-checker:disable-line - let s = "zxc \t\nqwe jlk hjl"; // spell-checker:disable-line + let s = "zxc \t\nqwe jlk hjl"; // spell-checker:disable-line let (k, v) = s.split_two(); assert_eq!("zxc", k); assert_eq!("qwe jlk hjl", v); diff --git a/tests/by-util/test_echo.rs b/tests/by-util/test_echo.rs index 483ad99f5..09ed9658f 100644 --- a/tests/by-util/test_echo.rs +++ b/tests/by-util/test_echo.rs @@ -189,7 +189,7 @@ fn test_hyphen_values_inside_string() { new_ucmd!() .arg("'\"\n'CXXFLAGS=-g -O2'\n\"'") // spell-checker:disable-line .succeeds() - .stdout_contains("CXXFLAGS"); // spell-checker:disable-line + .stdout_contains("CXXFLAGS"); // spell-checker:disable-line } #[test] diff --git a/tests/by-util/test_factor.rs b/tests/by-util/test_factor.rs index 063cf0e4f..a3f06ea8a 100644 --- a/tests/by-util/test_factor.rs +++ b/tests/by-util/test_factor.rs @@ -209,7 +209,10 @@ fn test_big_primes() { fn run(input_string: &[u8], output_string: &[u8]) { println!("STDIN='{}'", String::from_utf8_lossy(input_string)); - println!("STDOUT(expected)='{}'", String::from_utf8_lossy(output_string)); + println!( + "STDOUT(expected)='{}'", + String::from_utf8_lossy(output_string) + ); // now run factor new_ucmd!() .pipe_in(input_string) diff --git a/tests/by-util/test_fold.rs b/tests/by-util/test_fold.rs index 62a2bddf3..1acdadac1 100644 --- a/tests/by-util/test_fold.rs +++ b/tests/by-util/test_fold.rs @@ -282,7 +282,7 @@ fn test_backspace_is_not_word_boundary() { .args(&["-w10", "-s"]) .pipe_in("foobar\x086789abcdef") .succeeds() - .stdout_is("foobar\x086789a\nbcdef"); // spell-checker:disable-line + .stdout_is("foobar\x086789a\nbcdef"); // spell-checker:disable-line } #[test] @@ -308,9 +308,9 @@ fn test_carriage_return_should_reset_column_count() { fn test_carriage_return_is_not_word_boundary() { new_ucmd!() .args(&["-w6", "-s"]) - .pipe_in("fizz\rbuzz\rfizzbuzz") // spell-checker:disable-line + .pipe_in("fizz\rbuzz\rfizzbuzz") // spell-checker:disable-line .succeeds() - .stdout_is("fizz\rbuzz\rfizzbu\nzz"); // spell-checker:disable-line + .stdout_is("fizz\rbuzz\rfizzbu\nzz"); // spell-checker:disable-line } // @@ -530,7 +530,7 @@ fn test_bytewise_carriage_return_should_not_reset_column_count() { fn test_bytewise_carriage_return_is_not_word_boundary() { new_ucmd!() .args(&["-w6", "-s", "-b"]) - .pipe_in("fizz\rbuzz\rfizzbuzz") // spell-checker:disable-line + .pipe_in("fizz\rbuzz\rfizzbuzz") // spell-checker:disable-line .succeeds() .stdout_is("fizz\rb\nuzz\rfi\nzzbuzz"); // spell-checker:disable-line } diff --git a/tests/by-util/test_kill.rs b/tests/by-util/test_kill.rs index 886445109..fe5d4557a 100644 --- a/tests/by-util/test_kill.rs +++ b/tests/by-util/test_kill.rs @@ -82,7 +82,7 @@ fn test_kill_set_bad_signal_name() { // spell-checker:disable-line new_ucmd!() .arg("-s") - .arg("IAMNOTASIGNAL") // spell-checker:disable-line + .arg("IAMNOTASIGNAL") // spell-checker:disable-line .fails() .stderr_contains("unknown signal"); } diff --git a/tests/by-util/test_ln.rs b/tests/by-util/test_ln.rs index 4dc50566b..e475e3608 100644 --- a/tests/by-util/test_ln.rs +++ b/tests/by-util/test_ln.rs @@ -120,7 +120,7 @@ fn test_symlink_interactive() { scene .ucmd() .args(&["-i", "-s", file, link]) - .pipe_in("Yesh") // spell-checker:disable-line + .pipe_in("Yesh") // spell-checker:disable-line .succeeds() .no_stderr(); diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs index dd6e4a85d..20c6b913d 100644 --- a/tests/by-util/test_ls.rs +++ b/tests/by-util/test_ls.rs @@ -941,7 +941,7 @@ fn test_ls_color() { let a_with_colors = "\x1b[1;34ma\x1b[0m"; let z_with_colors = "\x1b[1;34mz\x1b[0m"; - let nested_dir_with_colors = "\x1b[1;34mnested_dir\x1b[0m"; // spell-checker:disable-line + let nested_dir_with_colors = "\x1b[1;34mnested_dir\x1b[0m"; // spell-checker:disable-line // Color is disabled by default let result = scene.ucmd().succeeds(); diff --git a/tests/by-util/test_mktemp.rs b/tests/by-util/test_mktemp.rs index e61d45428..d601bad5b 100644 --- a/tests/by-util/test_mktemp.rs +++ b/tests/by-util/test_mktemp.rs @@ -10,8 +10,8 @@ static TEST_TEMPLATE2: &str = "temp"; static TEST_TEMPLATE3: &str = "tempX"; static TEST_TEMPLATE4: &str = "tempXX"; static TEST_TEMPLATE5: &str = "tempXXX"; -static TEST_TEMPLATE6: &str = "tempXXXlate"; // spell-checker:disable-line -static TEST_TEMPLATE7: &str = "XXXtemplate"; // spell-checker:disable-line +static TEST_TEMPLATE6: &str = "tempXXXlate"; // spell-checker:disable-line +static TEST_TEMPLATE7: &str = "XXXtemplate"; // spell-checker:disable-line #[cfg(unix)] static TEST_TEMPLATE8: &str = "tempXXXl/ate"; #[cfg(windows)] diff --git a/tests/by-util/test_more.rs b/tests/by-util/test_more.rs index 69499ccfe..9b28ee24e 100644 --- a/tests/by-util/test_more.rs +++ b/tests/by-util/test_more.rs @@ -5,7 +5,8 @@ fn test_more_no_arg() { // Reading from stdin is now supported, so this must succeed if atty::is(atty::Stream::Stdout) { new_ucmd!().succeeds(); - } else {} + } else { + } } #[test] @@ -19,5 +20,6 @@ fn test_more_dir_arg() { const EXPECTED_ERROR_MESSAGE: &str = "more: '.' is a directory.\nTry 'more --help' for more information."; assert_eq!(result.stderr_str().trim(), EXPECTED_ERROR_MESSAGE); - } else {} + } else { + } } diff --git a/tests/by-util/test_mv.rs b/tests/by-util/test_mv.rs index 2782ac246..2f35bf5eb 100644 --- a/tests/by-util/test_mv.rs +++ b/tests/by-util/test_mv.rs @@ -171,7 +171,7 @@ fn test_mv_interactive() { .arg("-i") .arg(file_a) .arg(file_b) - .pipe_in("Yesh") // spell-checker:disable-line + .pipe_in("Yesh") // spell-checker:disable-line .succeeds() .no_stderr(); diff --git a/tests/by-util/test_nice.rs b/tests/by-util/test_nice.rs index 005651c52..25886de78 100644 --- a/tests/by-util/test_nice.rs +++ b/tests/by-util/test_nice.rs @@ -17,7 +17,7 @@ fn test_negative_adjustment() { let res = new_ucmd!().args(&["-n", "-1", "true"]).run(); assert!(res .stderr_str() - .starts_with("nice: warning: setpriority: Permission denied")); // spell-checker:disable-line + .starts_with("nice: warning: setpriority: Permission denied")); // spell-checker:disable-line } #[test] diff --git a/tests/by-util/test_od.rs b/tests/by-util/test_od.rs index 6b1c39d63..c21c683dc 100644 --- a/tests/by-util/test_od.rs +++ b/tests/by-util/test_od.rs @@ -81,7 +81,7 @@ fn test_2files() { fn test_no_file() { let temp = env::temp_dir(); let tmpdir = Path::new(&temp); - let file = tmpdir.join("}surely'none'would'thus'a'file'name"); // spell-checker:disable-line + let file = tmpdir.join("}surely'none'would'thus'a'file'name"); // spell-checker:disable-line new_ucmd!().arg(file.as_os_str()).fails(); } @@ -89,7 +89,7 @@ fn test_no_file() { // Test that od reads from stdin instead of a file #[test] fn test_from_stdin() { - let input = "abcdefghijklmnopqrstuvwxyz\n"; // spell-checker:disable-line + let input = "abcdefghijklmnopqrstuvwxyz\n"; // spell-checker:disable-line new_ucmd!() .arg("--endian=little") .run_piped_stdin(input.as_bytes()) @@ -128,7 +128,7 @@ fn test_from_mixed() { #[test] fn test_multiple_formats() { - let input = "abcdefghijklmnopqrstuvwxyz\n"; // spell-checker:disable-line + let input = "abcdefghijklmnopqrstuvwxyz\n"; // spell-checker:disable-line new_ucmd!() .arg("-c") .arg("-b") @@ -294,7 +294,7 @@ fn test_multibyte() { new_ucmd!() .arg("-c") .arg("-w12") - .run_piped_stdin("Universität Tübingen \u{1B000}".as_bytes()) // spell-checker:disable-line + .run_piped_stdin("Universität Tübingen \u{1B000}".as_bytes()) // spell-checker:disable-line .success() .no_stderr() .stdout_is(unindent( @@ -511,7 +511,7 @@ fn test_max_uint() { new_ucmd!() .arg("--format=o8") - .arg("-Oobtu8") // spell-checker:disable-line + .arg("-Oobtu8") // spell-checker:disable-line .arg("-Dd") .arg("--format=u1") .run_piped_stdin(&input[..]) @@ -589,7 +589,7 @@ fn test_invalid_offset() { #[test] fn test_skip_bytes() { - let input = "abcdefghijklmnopq"; // spell-checker:disable-line + let input = "abcdefghijklmnopq"; // spell-checker:disable-line new_ucmd!() .arg("-c") .arg("--skip-bytes=5") @@ -615,7 +615,7 @@ fn test_skip_bytes_error() { #[test] fn test_read_bytes() { - let input = "abcdefghijklmnopqrstuvwxyz\n12345678"; // spell-checker:disable-line + let input = "abcdefghijklmnopqrstuvwxyz\n12345678"; // spell-checker:disable-line new_ucmd!() .arg("--endian=little") .arg("--read-bytes=27") @@ -674,7 +674,7 @@ fn test_filename_parsing() { #[test] fn test_stdin_offset() { - let input = "abcdefghijklmnopq"; // spell-checker:disable-line + let input = "abcdefghijklmnopq"; // spell-checker:disable-line new_ucmd!() .arg("-c") .arg("+5") @@ -709,7 +709,7 @@ fn test_file_offset() { #[test] fn test_traditional() { // note gnu od does not align both lines - let input = "abcdefghijklmnopq"; // spell-checker:disable-line + let input = "abcdefghijklmnopq"; // spell-checker:disable-line new_ucmd!() .arg("--traditional") .arg("-a") @@ -732,7 +732,7 @@ fn test_traditional() { #[test] fn test_traditional_with_skip_bytes_override() { // --skip-bytes is ignored in this case - let input = "abcdefghijklmnop"; // spell-checker:disable-line + let input = "abcdefghijklmnop"; // spell-checker:disable-line new_ucmd!() .arg("--traditional") .arg("--skip-bytes=10") @@ -752,7 +752,7 @@ fn test_traditional_with_skip_bytes_override() { #[test] fn test_traditional_with_skip_bytes_non_override() { // no offset specified in the traditional way, so --skip-bytes is used - let input = "abcdefghijklmnop"; // spell-checker:disable-line + let input = "abcdefghijklmnop"; // spell-checker:disable-line new_ucmd!() .arg("--traditional") .arg("--skip-bytes=10") @@ -782,7 +782,7 @@ fn test_traditional_error() { #[test] fn test_traditional_only_label() { - let input = "abcdefghijklmnopqrstuvwxyz"; // spell-checker:disable-line + let input = "abcdefghijklmnopqrstuvwxyz"; // spell-checker:disable-line new_ucmd!() .arg("-An") .arg("--traditional") diff --git a/tests/by-util/test_pinky.rs b/tests/by-util/test_pinky.rs index c3c9ea2e4..0813e5e1b 100644 --- a/tests/by-util/test_pinky.rs +++ b/tests/by-util/test_pinky.rs @@ -9,9 +9,9 @@ pub use self::pinky::*; #[test] fn test_capitalize() { - assert_eq!("Zbnmasd", "zbnmasd".capitalize()); // spell-checker:disable-line - assert_eq!("Abnmasd", "Abnmasd".capitalize()); // spell-checker:disable-line - assert_eq!("1masd", "1masd".capitalize()); // spell-checker:disable-line + assert_eq!("Zbnmasd", "zbnmasd".capitalize()); // spell-checker:disable-line + assert_eq!("Abnmasd", "Abnmasd".capitalize()); // spell-checker:disable-line + assert_eq!("1masd", "1masd".capitalize()); // spell-checker:disable-line assert_eq!("", "".capitalize()); } diff --git a/tests/by-util/test_printf.rs b/tests/by-util/test_printf.rs index 40e91ef4f..b5c9dc3ed 100644 --- a/tests/by-util/test_printf.rs +++ b/tests/by-util/test_printf.rs @@ -401,7 +401,7 @@ fn sub_any_asterisk_hex_arg() { #[test] fn sub_any_specifiers_no_params() { new_ucmd!() - .args(&["%ztlhLji", "3"]) //spell-checker:disable-line + .args(&["%ztlhLji", "3"]) //spell-checker:disable-line .succeeds() .stdout_only("3"); } @@ -409,7 +409,7 @@ fn sub_any_specifiers_no_params() { #[test] fn sub_any_specifiers_after_first_param() { new_ucmd!() - .args(&["%0ztlhLji", "3"]) //spell-checker:disable-line + .args(&["%0ztlhLji", "3"]) //spell-checker:disable-line .succeeds() .stdout_only("3"); } @@ -417,7 +417,7 @@ fn sub_any_specifiers_after_first_param() { #[test] fn sub_any_specifiers_after_period() { new_ucmd!() - .args(&["%0.ztlhLji", "3"]) //spell-checker:disable-line + .args(&["%0.ztlhLji", "3"]) //spell-checker:disable-line .succeeds() .stdout_only("3"); } @@ -425,7 +425,7 @@ fn sub_any_specifiers_after_period() { #[test] fn sub_any_specifiers_after_second_param() { new_ucmd!() - .args(&["%0.0ztlhLji", "3"]) //spell-checker:disable-line + .args(&["%0.0ztlhLji", "3"]) //spell-checker:disable-line .succeeds() .stdout_only("3"); } diff --git a/tests/by-util/test_relpath.rs b/tests/by-util/test_relpath.rs index 051f46084..44a685c90 100644 --- a/tests/by-util/test_relpath.rs +++ b/tests/by-util/test_relpath.rs @@ -120,7 +120,7 @@ fn test_relpath_with_from_with_d() { .ucmd() .arg(to) .arg(from) - .arg("-dnon_existing") // spell-checker:disable-line + .arg("-dnon_existing") // spell-checker:disable-line .succeeds() .stdout_move_str(); assert!(Path::new(&_result_stdout).is_absolute()); @@ -170,7 +170,7 @@ fn test_relpath_no_from_with_d() { let result_stdout = scene .ucmd() .arg(to) - .arg("-dnon_existing") // spell-checker:disable-line + .arg("-dnon_existing") // spell-checker:disable-line .succeeds() .stdout_move_str(); assert!(Path::new(&result_stdout).is_absolute()); diff --git a/tests/by-util/test_rm.rs b/tests/by-util/test_rm.rs index 64259d02c..0592be244 100644 --- a/tests/by-util/test_rm.rs +++ b/tests/by-util/test_rm.rs @@ -65,7 +65,7 @@ fn test_rm_interactive() { .arg("-i") .arg(file_a) .arg(file_b) - .pipe_in("Yesh") // spell-checker:disable-line + .pipe_in("Yesh") // spell-checker:disable-line .succeeds(); assert!(!at.file_exists(file_a)); diff --git a/tests/by-util/test_sort.rs b/tests/by-util/test_sort.rs index c31d44110..d2b447925 100644 --- a/tests/by-util/test_sort.rs +++ b/tests/by-util/test_sort.rs @@ -292,10 +292,10 @@ fn test_dictionary_order() { fn test_dictionary_order2() { for non_dictionary_order2_param in &["-d"] { new_ucmd!() - .pipe_in("a👦🏻aa b\naaaa b") // spell-checker:disable-line - .arg(non_dictionary_order2_param) // spell-checker:disable-line + .pipe_in("a👦🏻aa b\naaaa b") // spell-checker:disable-line + .arg(non_dictionary_order2_param) // spell-checker:disable-line .succeeds() - .stdout_only("a👦🏻aa b\naaaa b\n"); // spell-checker:disable-line + .stdout_only("a👦🏻aa b\naaaa b\n"); // spell-checker:disable-line } } @@ -303,10 +303,10 @@ fn test_dictionary_order2() { fn test_non_printing_chars() { for non_printing_chars_param in &["-i"] { new_ucmd!() - .pipe_in("a👦🏻aa\naaaa") // spell-checker:disable-line - .arg(non_printing_chars_param) // spell-checker:disable-line + .pipe_in("a👦🏻aa\naaaa") // spell-checker:disable-line + .arg(non_printing_chars_param) // spell-checker:disable-line .succeeds() - .stdout_only("a👦🏻aa\naaaa\n"); // spell-checker:disable-line + .stdout_only("a👦🏻aa\naaaa\n"); // spell-checker:disable-line } } diff --git a/tests/by-util/test_stat.rs b/tests/by-util/test_stat.rs index 5c8d9d185..89dd96752 100644 --- a/tests/by-util/test_stat.rs +++ b/tests/by-util/test_stat.rs @@ -13,9 +13,9 @@ fn test_scanners() { assert_eq!(None, "z192zxc".scan_num::()); assert_eq!(Some(('a', 3)), "141zxc".scan_char(8)); - assert_eq!(Some(('\n', 2)), "12qzxc".scan_char(8)); // spell-checker:disable-line - assert_eq!(Some(('\r', 1)), "dqzxc".scan_char(16)); // spell-checker:disable-line - assert_eq!(None, "z2qzxc".scan_char(8)); // spell-checker:disable-line + assert_eq!(Some(('\n', 2)), "12qzxc".scan_char(8)); // spell-checker:disable-line + assert_eq!(Some(('\r', 1)), "dqzxc".scan_char(16)); // spell-checker:disable-line + assert_eq!(None, "z2qzxc".scan_char(8)); // spell-checker:disable-line } #[test] diff --git a/tests/by-util/test_tail.rs b/tests/by-util/test_tail.rs index 0e3092562..b31344c34 100644 --- a/tests/by-util/test_tail.rs +++ b/tests/by-util/test_tail.rs @@ -268,7 +268,7 @@ fn test_parse_size() { assert!(parse_size("1Y").is_err()); // Bad number - assert!(parse_size("328hdsf3290").is_err()); // spell-checker:disable-line + assert!(parse_size("328hdsf3290").is_err()); // spell-checker:disable-line } #[test] diff --git a/tests/by-util/test_test.rs b/tests/by-util/test_test.rs index a29c4f6c6..aaf09d657 100644 --- a/tests/by-util/test_test.rs +++ b/tests/by-util/test_test.rs @@ -210,7 +210,7 @@ fn test_pseudofloat_not_equal() { #[test] fn test_negative_arg_is_a_string() { new_ucmd!().arg("-12345").succeeds(); - new_ucmd!().arg("--qwert").succeeds(); // spell-checker:disable-line + new_ucmd!().arg("--qwert").succeeds(); // spell-checker:disable-line } #[test] diff --git a/tests/by-util/test_tr.rs b/tests/by-util/test_tr.rs index 4ddaff573..936af2ca8 100644 --- a/tests/by-util/test_tr.rs +++ b/tests/by-util/test_tr.rs @@ -140,9 +140,9 @@ fn test_translate_and_squeeze() { fn test_translate_and_squeeze_multiple_lines() { new_ucmd!() .args(&["-s", "x", "y"]) - .pipe_in("xxaax\nxaaxx") // spell-checker:disable-line + .pipe_in("xxaax\nxaaxx") // spell-checker:disable-line .run() - .stdout_is("yaay\nyaay"); // spell-checker:disable-line + .stdout_is("yaay\nyaay"); // spell-checker:disable-line } #[test] @@ -169,7 +169,7 @@ fn test_set1_longer_than_set2() { .args(&["abc", "xy"]) .pipe_in("abcde") .run() - .stdout_is("xyyde"); // spell-checker:disable-line + .stdout_is("xyyde"); // spell-checker:disable-line } #[test] @@ -178,7 +178,7 @@ fn test_set1_shorter_than_set2() { .args(&["ab", "xyz"]) .pipe_in("abcde") .run() - .stdout_is("xycde"); // spell-checker:disable-line + .stdout_is("xycde"); // spell-checker:disable-line } #[test] @@ -187,7 +187,7 @@ fn test_truncate() { .args(&["-t", "abc", "xy"]) .pipe_in("abcde") .run() - .stdout_is("xycde"); // spell-checker:disable-line + .stdout_is("xycde"); // spell-checker:disable-line } #[test] @@ -196,7 +196,7 @@ fn test_truncate_with_set1_shorter_than_set2() { .args(&["-t", "ab", "xyz"]) .pipe_in("abcde") .run() - .stdout_is("xycde"); // spell-checker:disable-line + .stdout_is("xycde"); // spell-checker:disable-line } #[test] @@ -216,8 +216,8 @@ fn missing_required_second_arg_fails() { #[test] fn test_interpret_backslash_escapes() { new_ucmd!() - .args(&["abfnrtv", r"\a\b\f\n\r\t\v"]) // spell-checker:disable-line - .pipe_in("abfnrtv") // spell-checker:disable-line + .args(&["abfnrtv", r"\a\b\f\n\r\t\v"]) // spell-checker:disable-line + .pipe_in("abfnrtv") // spell-checker:disable-line .succeeds() .stdout_is("\u{7}\u{8}\u{c}\n\r\t\u{b}"); } diff --git a/tests/by-util/test_truncate.rs b/tests/by-util/test_truncate.rs index f98027127..bb0f4a596 100644 --- a/tests/by-util/test_truncate.rs +++ b/tests/by-util/test_truncate.rs @@ -47,12 +47,7 @@ fn test_reference() { scene.ucmd().arg("-s").arg("+5KB").arg(FILE1).run(); - scene - .ucmd() - .arg("--reference") - .arg(FILE1) - .arg(FILE2) - .run(); + scene.ucmd().arg("--reference").arg(FILE1).arg(FILE2).run(); file.seek(SeekFrom::End(0)).unwrap(); let actual = file.seek(SeekFrom::Current(0)).unwrap();