Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 21:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary reference to ichwh in command completer (#2435)

Browse source
This commit is contained in:
Jason Gedge 2020-08-27 10:14:04 -04:00 committed by GitHub
parent 26cec83b63
commit 728852c750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
crates/nu-cli/src/completion/command.rs
View file

@ -1,8 +1,6 @@
use std::fs::{read_dir, DirEntry}; use std::fs::{read_dir, DirEntry};
use std::iter::FromIterator; use std::iter::FromIterator;
#[cfg(all(windows, feature = "ichwh"))]
use ichwh::{IchwhError, IchwhResult};
use indexmap::set::IndexSet; use indexmap::set::IndexSet;
use crate::completion::{Context, Suggestion}; use crate::completion::{Context, Suggestion};
@ -31,23 +29,15 @@ impl Completer {
} }
} }
// These is_executable/pathext implementations are copied from ichwh and modified #[cfg(windows)]
// to not be async fn pathext() -> Option<Vec<String>> {
std::env::var_os("PATHEXT").map(|v| {
#[cfg(all(windows, feature = "ichwh"))] v.to_string_lossy()
fn pathext() -> IchwhResult<Vec<String>> { .split(';')
Ok(std::env::var_os("PATHEXT") // Cut off the leading '.' character
.ok_or(IchwhError::PathextNotDefined)? .map(|ext| ext[1..].to_string())
.to_string_lossy() .collect::<Vec<_>>()
.split(';') })
// Cut off the leading '.' character
.map(|ext| ext[1..].to_string())
.collect::<Vec<_>>())
}
#[cfg(all(windows, not(feature = "ichwh")))]
fn pathext() -> Result<Vec<String>, ()> {
Err(())
} }
#[cfg(windows)] #[cfg(windows)]
@ -61,7 +51,7 @@ fn is_executable(file: &DirEntry) -> bool {
} }
if let Some(extension) = file.path().extension() { if let Some(extension) = file.path().extension() {
if let Ok(exts) = pathext() { if let Some(exts) = pathext() {
exts.iter() exts.iter()
.any(|ext| extension.to_string_lossy().eq_ignore_ascii_case(ext)) .any(|ext| extension.to_string_lossy().eq_ignore_ascii_case(ext))
} else { } else {