extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-05-31 15:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed clippy errors, inconsistent behaviour

Browse Source
This commit is contained in:
Vivek Kethineni 2025-01-26 13:55:32 -06:00
parent fd2430062f
commit f89eeda3f8
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/nu-command/src/path/relative_to.rs
View File

@ -142,24 +142,37 @@ path."#
} }
fn relative_to(path: &Path, span: Span, args: &Arguments) -> Value { fn relative_to(path: &Path, span: Span, args: &Arguments) -> Value {
// Assume right arguemnt always is a directory (i.e. /a/b is really /a/b/)
// The output, when typed into a termiinal at the right arugment leads to the left.
let lhs = expand_to_real_path(path); let lhs = expand_to_real_path(path);
let rhs = expand_to_real_path(&args.path.item); let rhs = expand_to_real_path(&args.path.item);
match (lhs.to_str(), rhs.to_str()) { match (lhs.to_str(), rhs.to_str()) {
(Some(child_str), Some(parent_str)) => { (Some(child_str), Some(parent_str)) => {
let mut parent_str = parent_str
.trim_end_matches('/')
.trim_start_matches('/')
.to_string();
parent_str.push('/');
let common: String = child_str let common: String = child_str
.split("/") .trim_start_matches('/')
.zip(parent_str.split("/")) .split('/')
.zip(parent_str.split('/'))
.take_while(|(x, y)| x == y) .take_while(|(x, y)| x == y)
.map(|(x, _)| x.to_string() + "/") .map(|(x, _)| x.to_string() + "/")
.collect(); .collect();
if let Some(x) = child_str.strip_prefix(&common) { if let Some(x) = child_str.strip_prefix(&common) {
if parent_str == common.trim_end_matches("/") { if parent_str == common {
return Value::string(x.to_string(), span); return Value::string(x.to_string(), span);
} }
if let Some(remaining_parent) = parent_str.strip_prefix(&common) { if let Some(remaining_parent) = parent_str.strip_prefix(&common) {
let mut path: String = remaining_parent.split("/").map(|_| "../").collect(); let mut path: String = remaining_parent
.split('/')
.filter(|&x| x.is_empty())
.map(|_| "../")
.collect();
path.push_str(x); path.push_str(x);
return Value::string(path.to_string(), span); return Value::string(path.to_string(), span);
} }
@ -176,7 +189,7 @@ fn relative_to(path: &Path, span: Span, args: &Arguments) -> Value {
} }
_ => Value::error( _ => Value::error(
ShellError::IncorrectValue { ShellError::IncorrectValue {
msg: "Either the input or the argument path is incorrect".into(), msg: "Unable to convert one or more of the arugments into strings!".into(),
val_span: span, val_span: span,
call_span: span, call_span: span,
}, },