From 539da3ba1a310f442476a60246cfbb5041a20499 Mon Sep 17 00:00:00 2001 From: Jeremiah Peschka Date: Fri, 25 Mar 2016 16:36:34 -0700 Subject: [PATCH] Changed display_symlink_count to use the right variable name. Removed dead code. --- src/ls/ls.rs | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/src/ls/ls.rs b/src/ls/ls.rs index 2e71e7b24..1ac4fcc8b 100644 --- a/src/ls/ls.rs +++ b/src/ls/ls.rs @@ -194,7 +194,7 @@ fn display_symlink_count(metadata: &Metadata) -> String { fn display_symlink_count(metadata: &Metadata) -> String { use std::os::unix::fs::MetadataExt; - md.nlink().to_string() + metadata.nlink().to_string() } #[cfg(target_family = "windows")] @@ -207,32 +207,9 @@ fn display_permissions(metadata: &Metadata) -> String { fn display_permissions(metadata: &Metadata) -> String { use std::os::unix::fs::PermissionsExt; - "lolwtfbbq".to_string(); + "xxxxxxxxx".to_string(); } - -// fn list_directory_contents(directory: &Path, options: &getopts::Matches) { -// let rd = fs::read_dir(directory); - -// match rd { -// Err(err) => println!("ERROR! {}", err), -// Ok(entries) => display_directory_contents(entries, &options), -// } -// } - -// fn display_directory_contents(contents: ReadDir, options: &getopts::Matches) { -// for entry in contents { -// let entry = match entry { -// Err(err) => { -// println!("ERROR! {}", err); -// panic!() -// }, -// Ok(en) => en -// }; -// display_item(entry.path().as_path(), &options); -// } -// } - fn display_item(item: &Path, options: &getopts::Matches) { // let fileType = item.file // let mut fileMeta = String::new();