From 7faa4fbff48c9d3a77880d518053a970aa7b9ca3 Mon Sep 17 00:00:00 2001 From: Darren Schroeder <343840+fdncred@users.noreply.github.com> Date: Wed, 29 Dec 2021 21:16:50 -0600 Subject: [PATCH] revert file_types to lowercase (#623) * revert file_types to lowercase * fix test --- crates/nu-command/src/filesystem/ls.rs | 16 ++++++++-------- crates/nu-command/src/path/type.rs | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs index 4051793c29..785d42252b 100644 --- a/crates/nu-command/src/filesystem/ls.rs +++ b/crates/nu-command/src/filesystem/ls.rs @@ -217,24 +217,24 @@ use std::path::{Path, PathBuf}; pub fn get_file_type(md: &std::fs::Metadata) -> &str { let ft = md.file_type(); - let mut file_type = "Unknown"; + let mut file_type = "unknown"; if ft.is_dir() { - file_type = "Dir"; + file_type = "dir"; } else if ft.is_file() { - file_type = "File"; + file_type = "file"; } else if ft.is_symlink() { - file_type = "Symlink"; + file_type = "symlink"; } else { #[cfg(unix)] { if ft.is_block_device() { - file_type = "Block device"; + file_type = "block device"; } else if ft.is_char_device() { - file_type = "Char device"; + file_type = "char device"; } else if ft.is_fifo() { - file_type = "Pipe"; + file_type = "pipe"; } else if ft.is_socket() { - file_type = "Socket"; + file_type = "socket"; } } } diff --git a/crates/nu-command/src/path/type.rs b/crates/nu-command/src/path/type.rs index d75fd2d9df..c00123b3d3 100644 --- a/crates/nu-command/src/path/type.rs +++ b/crates/nu-command/src/path/type.rs @@ -59,7 +59,7 @@ impl Command for SubCommand { Example { description: "Show type of a filepath", example: "'.' | path type", - result: Some(Value::test_string("Dir")), + result: Some(Value::test_string("dir")), }, Example { description: "Show type of a filepath in a column", @@ -84,25 +84,25 @@ fn r#type(path: &Path, span: Span, _: &Arguments) -> Value { fn get_file_type(md: &std::fs::Metadata) -> &str { let ft = md.file_type(); - let mut file_type = "Unknown"; + let mut file_type = "unknown"; if ft.is_dir() { - file_type = "Dir"; + file_type = "dir"; } else if ft.is_file() { - file_type = "File"; + file_type = "file"; } else if ft.is_symlink() { - file_type = "Symlink"; + file_type = "symlink"; } else { #[cfg(unix)] { use std::os::unix::fs::FileTypeExt; if ft.is_block_device() { - file_type = "Block device"; + file_type = "block device"; } else if ft.is_char_device() { - file_type = "Char device"; + file_type = "char device"; } else if ft.is_fifo() { - file_type = "Pipe"; + file_type = "pipe"; } else if ft.is_socket() { - file_type = "Socket"; + file_type = "socket"; } } }