Simplify

Author: ryuichiueda

src/core/builtins/completion.rs

@@ -1,7 +1,7 @@
 //SPDX-FileCopyrightText: 2023 Ryuichi Ueda <ryuichiueda@gmail.com>
 //SPDX-License-Identifier: BSD-3-Clause
 
-use crate::{ShellCore, Feeder};
+use crate::{file_check, ShellCore, Feeder};
 use crate::elements::word::Word;
 use crate::utils;
 use crate::utils::directory;
@@ -138,7 +138,7 @@ pub fn compgen_c(core: &mut ShellCore, args: &mut Vec<String>) -> Vec<String> {
     if args.len() > 2 {
         commands.extend(compgen_f(core, args));
     }
-    commands.retain(|p| Path::new(p).executable() || Path::new(p).is_dir());
+    commands.retain(|p| Path::new(p).executable() || file_check::is_dir(p));
 
     let mut aliases: Vec<String> = core.data.aliases.clone().into_keys().collect();
     commands.append(&mut aliases);
@@ -158,7 +158,7 @@ pub fn compgen_c(core: &mut ShellCore, args: &mut Vec<String>) -> Vec<String> {
 
 fn compgen_d(core: &mut ShellCore, args: &mut Vec<String>) -> Vec<String> {
     let mut paths = compgen_f(core, args);
-    paths.retain(|p| Path::new(p).is_dir());
+    paths.retain(|p| file_check::is_dir(&p));
     paths
 }
 

src/core/builtins/source.rs

@@ -1,11 +1,10 @@
 //SPDX-FileCopyrightText: 2024 Ryuichi Ueda <ryuichiueda@gmail.com>
 //SPDX-License-Identifier: BSD-3-Clause
 
-use crate::{Script, ShellCore, Feeder};
+use crate::{file_check, Script, ShellCore, Feeder};
 use crate::elements::io;
 use std::fs::File;
 use std::os::fd::IntoRawFd;
-use std::path::Path;
 
 pub fn source(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
     if args.len() < 2 {
@@ -14,7 +13,7 @@ pub fn source(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
         return 2;
     }
 
-    if Path::new(&args[1]).is_dir() {
+    if file_check::is_dir(&args[1]) {
         eprintln!("bash: source: {}: is a directory", &args[1]);
         return 1;
     }

src/feeder/terminal/completion.rs

@@ -1,13 +1,12 @@
 //SPDX-FileCopyrightText: 2024 Ryuichi Ueda ryuichiueda@gmail.com
 //SPDX-License-Identifier: BSD-3-Clause
 
-use crate::{error_message, Feeder, ShellCore, utils};
+use crate::{error_message, file_check, Feeder, ShellCore, utils};
 use crate::core::builtins::completion;
 use crate::elements::command::simple::SimpleCommand;
 use crate::elements::command::Command;
 use crate::elements::io::pipe::Pipe;
 use crate::feeder::terminal::Terminal;
-use std::path::Path;
 use termion::cursor::DetectCursorPos;
 use unicode_width::UnicodeWidthStr;
 
@@ -45,7 +44,7 @@ fn is_dir(s: &str, core: &mut ShellCore) -> bool {
     let tilde_prefix = "~/".to_string();
     let tilde_path = core.data.get_param("HOME").to_string() + "/";
 
-    Path::new(&s.replace(&tilde_prefix, &tilde_path)).is_dir()
+    file_check::is_dir(&s.replace(&tilde_prefix, &tilde_path))
 }
 
 impl Terminal {