RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 19:47:45 +00:00
Code Issues Activity

Merge pull request #3412 from cakebaker/remove_options_field

Browse source 
df: remove obsolete "show_listed_fs" options field
This commit is contained in:
Terts Diepraam 2022-04-17 08:42:12 +02:00 • committed by GitHub
commit 0a3b07f056
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/uu/df/src/df.rs
View file

@ -61,7 +61,6 @@ static OUTPUT_FIELD_LIST: [&str; 12] = [
struct Options { struct Options {
show_local_fs: bool, show_local_fs: bool,
show_all_fs: bool, show_all_fs: bool,
show_listed_fs: bool,
block_size: BlockSize, block_size: BlockSize,
/// Optional list of filesystem types to include in the output table. /// Optional list of filesystem types to include in the output table.
@ -88,7 +87,6 @@ impl Default for Options {
Self { Self {
show_local_fs: Default::default(), show_local_fs: Default::default(),
show_all_fs: Default::default(), show_all_fs: Default::default(),
show_listed_fs: Default::default(),
block_size: Default::default(), block_size: Default::default(),
include: Default::default(), include: Default::default(),
exclude: Default::default(), exclude: Default::default(),
@ -157,7 +155,6 @@ impl Options {
Ok(Self { Ok(Self {
show_local_fs: matches.is_present(OPT_LOCAL), show_local_fs: matches.is_present(OPT_LOCAL),
show_all_fs: matches.is_present(OPT_ALL), show_all_fs: matches.is_present(OPT_ALL),
show_listed_fs: false,
block_size: block_size_from_matches(matches) block_size: block_size_from_matches(matches)
.map_err(|_| OptionsError::InvalidBlockSize)?, .map_err(|_| OptionsError::InvalidBlockSize)?,
include, include,
@ -188,7 +185,7 @@ fn is_included(mi: &MountInfo, opt: &Options) -> bool {
} }
// Don't show pseudo filesystems unless `--all` has been given. // Don't show pseudo filesystems unless `--all` has been given.
if mi.dummy && !opt.show_all_fs && !opt.show_listed_fs { if mi.dummy && !opt.show_all_fs {
return false; return false;
} }
@ -394,7 +391,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
// If the filesystem is not empty, or if the options require // If the filesystem is not empty, or if the options require
// showing all filesystems, then print the data as a row in // showing all filesystems, then print the data as a row in
// the output table. // the output table.
if opt.show_all_fs || opt.show_listed_fs || filesystem.usage.blocks > 0 { if opt.show_all_fs || filesystem.usage.blocks > 0 {
let row = Row::from(filesystem); let row = Row::from(filesystem);
println!("{}", DisplayRow::new(&row, &opt)); println!("{}", DisplayRow::new(&row, &opt));
total += row; total += row;
@ -667,7 +664,6 @@ mod tests {
fn test_dummy_included() { fn test_dummy_included() {
let opt = Options { let opt = Options {
show_all_fs: true, show_all_fs: true,
show_listed_fs: true,
..Default::default() ..Default::default()
}; };
let m = mount_info("ext4", "/mnt/foo", false, true); let m = mount_info("ext4", "/mnt/foo", false, true);