diff --git a/src/uu/comm/src/comm.rs b/src/uu/comm/src/comm.rs index f83717292..cae405865 100644 --- a/src/uu/comm/src/comm.rs +++ b/src/uu/comm/src/comm.rs @@ -42,7 +42,7 @@ struct LineReader { impl LineReader { fn new(input: Input, line_ending: LineEnding) -> Self { - Self { input, line_ending } + Self { line_ending, input } } fn read_line(&mut self, buf: &mut Vec) -> io::Result { diff --git a/src/uu/cut/src/cut.rs b/src/uu/cut/src/cut.rs index 17dfea455..cd6eb22d3 100644 --- a/src/uu/cut/src/cut.rs +++ b/src/uu/cut/src/cut.rs @@ -476,10 +476,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Options { out_delimiter, line_ending, - field_opts: Some(FieldOptions { - only_delimited, - delimiter, - })}, + field_opts: Some(FieldOptions { delimiter, only_delimited })}, ) }), (2.., _, _, _) => Err( diff --git a/src/uu/df/src/filesystem.rs b/src/uu/df/src/filesystem.rs index 8cc639d68..5e86cf317 100644 --- a/src/uu/df/src/filesystem.rs +++ b/src/uu/df/src/filesystem.rs @@ -111,9 +111,9 @@ impl Filesystem { #[cfg(windows)] let usage = FsUsage::new(Path::new(&_stat_path)).ok()?; Some(Self { + file, mount_info, usage, - file, }) } diff --git a/src/uu/fmt/src/fmt.rs b/src/uu/fmt/src/fmt.rs index 45da48a91..007e75dd6 100644 --- a/src/uu/fmt/src/fmt.rs +++ b/src/uu/fmt/src/fmt.rs @@ -154,13 +154,13 @@ impl FmtOptions { crown, tagged, mail, - uniform, - quick, split_only, prefix, xprefix, anti_prefix, xanti_prefix, + uniform, + quick, width, goal, tabwidth, diff --git a/src/uucore/src/lib/features/format/num_format.rs b/src/uucore/src/lib/features/format/num_format.rs index 0cd5d6c13..546171b96 100644 --- a/src/uucore/src/lib/features/format/num_format.rs +++ b/src/uucore/src/lib/features/format/num_format.rs @@ -204,9 +204,9 @@ impl Formatter for UnsignedInt { }; Ok(Self { + variant, width, precision, - variant, alignment, }) } diff --git a/src/uucore/src/lib/features/fsext.rs b/src/uucore/src/lib/features/fsext.rs index 6bf7d18f4..c161db39f 100644 --- a/src/uucore/src/lib/features/fsext.rs +++ b/src/uucore/src/lib/features/fsext.rs @@ -179,9 +179,9 @@ impl MountInfo { dev_id, dev_name, fs_type, + mount_root, mount_dir, mount_option, - mount_root, remote, dummy, })