Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use AbsolutePathBuf::into_std_path_buf

Browse Source
This commit is contained in:
Ian Manske 2024-07-08 17:39:48 -07:00
parent c8dd42c0a7
commit 6c859cf68f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/nu-cmd-base/src/util.rs
View File

@ -1,3 +1,4 @@
use nu_path::AbsolutePathBuf;
use nu_protocol::{ use nu_protocol::{
engine::{EngineState, Stack}, engine::{EngineState, Stack},
Range, ShellError, Span, Value, Range, ShellError, Span, Value,
@ -15,7 +16,7 @@ pub fn get_init_cwd() -> PathBuf {
pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> PathBuf { pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> PathBuf {
engine_state engine_state
.cwd(Some(stack)) .cwd(Some(stack))
.map(Into::into) .map(AbsolutePathBuf::into_std_path_buf)
.unwrap_or(crate::util::get_init_cwd()) .unwrap_or(crate::util::get_init_cwd())
} }

3
crates/nu-command/src/filesystem/cd.rs
View File

@ -1,5 +1,6 @@
use nu_cmd_base::util::get_init_cwd; use nu_cmd_base::util::get_init_cwd;
use nu_engine::command_prelude::*; use nu_engine::command_prelude::*;
use nu_path::AbsolutePathBuf;
use nu_utils::filesystem::{have_permission, PermissionResult}; use nu_utils::filesystem::{have_permission, PermissionResult};
#[derive(Clone)] #[derive(Clone)]
@ -45,7 +46,7 @@ impl Command for Cd {
// user can use `cd` to recover PWD to a good state. // user can use `cd` to recover PWD to a good state.
let cwd = engine_state let cwd = engine_state
.cwd(Some(stack)) .cwd(Some(stack))
.map(Into::into) .map(AbsolutePathBuf::into_std_path_buf)
.unwrap_or(get_init_cwd()); .unwrap_or(get_init_cwd());
let path_val = { let path_val = {