holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change ls to output path (#2829)

Browse Source 
* make name a path vs string

* add support for comparing path to string
This commit is contained in:
Darren Schroeder 2020-12-28 14:52:28 -06:00 committed by GitHub
parent 5ff4bcfb7a
commit f449baf8de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-cli/src/shell/filesystem_shell.rs
View File

@ -979,7 +979,7 @@ pub(crate) fn dir_entry_dict(
) )
})?; })?;
dict.insert_untagged("name", UntaggedValue::string(name)); dict.insert_untagged("name", UntaggedValue::path(name));
if let Some(md) = metadata { if let Some(md) = metadata {
dict.insert_untagged("type", get_file_type(md)); dict.insert_untagged("type", get_file_type(md));

6
crates/nu-data/src/base.rs
View File

@ -152,6 +152,12 @@ pub fn coerce_compare_primitive(
(Date(left), Date(right)) => CompareValues::Date(*left, *right), (Date(left), Date(right)) => CompareValues::Date(*left, *right),
(Date(left), Duration(right)) => CompareValues::DateDuration(*left, right.clone()), (Date(left), Duration(right)) => CompareValues::DateDuration(*left, right.clone()),
(Boolean(left), Boolean(right)) => CompareValues::Booleans(*left, *right), (Boolean(left), Boolean(right)) => CompareValues::Booleans(*left, *right),
(Path(left), String(right)) => {
CompareValues::String(left.as_path().display().to_string(), right.clone())
}
(String(left), Path(right)) => {
CompareValues::String(left.clone(), right.as_path().display().to_string())
}
_ => return Err((left.type_name(), right.type_name())), _ => return Err((left.type_name(), right.type_name())),
}) })
} }