extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 02:24:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update ichwh to 3.0 (#1267)

Browse Source 
The [newest update for ichwh][changes] introduced some breaking changes.
This PR bumps the version and refactors the `which` command to take
these into account.

[changes]: https://gitlab.com/avandesa/ichwh-rs/blob/master/CHANGELOG.md#030-2020-01-22
This commit is contained in:
Alex van de Sandt
2020-01-22 18:26:49 -05:00
committed by Jonathan Turner
parent 66bd331ba9
commit 07191754bf
3 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/commands/which_.rs
View File

@ -90,7 +90,7 @@ fn which(
if all {
let stream = async_stream! {
if external {
if let Ok(path) = ichwh::which(&item).await {
if let Ok(Some(path)) = ichwh::which(&item).await {
yield ReturnSuccess::value(entry_path!(item, path.into(), application.tag.clone()));
}
}
@ -125,19 +125,25 @@ fn which(
} else {
let stream = async_stream! {
if external {
if let Ok(path) = ichwh::which(&item).await {
if let Ok(Some(path)) = ichwh::which(&item).await {
yield ReturnSuccess::value(entry_path!(item, path.into(), application.tag.clone()));
}
} else if commands.has(&item) {
yield ReturnSuccess::value(entry_builtin!(item, application.tag.clone()));
} else if let Ok(path) = ichwh::which(&item).await {
yield ReturnSuccess::value(entry_path!(item, path.into(), application.tag.clone()));
} else {
yield Err(ShellError::labeled_error(
"Binary not found for argument, and argument is not a builtin",
"not found",
&application.tag,
));
match ichwh::which(&item).await {
Ok(Some(path)) => yield ReturnSuccess::value(entry_path!(item, path.into(), application.tag.clone())),
Ok(None) => yield Err(ShellError::labeled_error(
"Binary not found for argument, and argument is not a builtin",
"not found",
&application.tag,
)),
Err(_) => yield Err(ShellError::labeled_error(
"Error trying to find binary for argument",
"error",
&application.tag,
)),
}
}
};