mirror of
https://github.com/nushell/nushell.git
synced 2025-07-08 18:37:07 +02:00
Migrate to a new PWD API (part 2) (#12749)
Refer to #12603 for part 1. We need to be careful when migrating to the new API, because the new API has slightly different semantics (PWD can contain symlinks). This PR handles the "obviously safe" part of the migrations. Namely, it handles two specific use cases: * Passing PWD into `canonicalize_with()` * Passing PWD into `EngineState::merge_env()` The first case is safe because symlinks are canonicalized away. The second case is safe because `EngineState::merge_env()` only uses PWD to call `std::env::set_current_dir()`, which shouldn't affact Nushell. The commit message contains detailed stats on the updated files. Because these migrations touch a lot of files, I want to keep these PRs small to avoid merge conflicts.
This commit is contained in:
@ -1,5 +1,4 @@
|
||||
#[allow(deprecated)]
|
||||
use nu_engine::{command_prelude::*, env::current_dir};
|
||||
use nu_engine::command_prelude::*;
|
||||
use std::sync::{atomic::AtomicBool, Arc};
|
||||
use wax::{Glob as WaxGlob, WalkBehavior, WalkEntry};
|
||||
|
||||
@ -179,8 +178,7 @@ impl Command for Glob {
|
||||
}
|
||||
};
|
||||
|
||||
#[allow(deprecated)]
|
||||
let path = current_dir(engine_state, stack)?;
|
||||
let path = engine_state.cwd_as_string(Some(stack))?;
|
||||
let path = match nu_path::canonicalize_with(prefix, path) {
|
||||
Ok(path) => path,
|
||||
Err(e) if e.to_string().contains("os error 2") =>
|
||||
|
@ -5,8 +5,7 @@ use notify_debouncer_full::{
|
||||
EventKind, RecursiveMode, Watcher,
|
||||
},
|
||||
};
|
||||
#[allow(deprecated)]
|
||||
use nu_engine::{command_prelude::*, current_dir, ClosureEval};
|
||||
use nu_engine::{command_prelude::*, ClosureEval};
|
||||
use nu_protocol::{
|
||||
engine::{Closure, StateWorkingSet},
|
||||
format_error,
|
||||
@ -74,8 +73,7 @@ impl Command for Watch {
|
||||
_input: PipelineData,
|
||||
) -> Result<PipelineData, ShellError> {
|
||||
let head = call.head;
|
||||
#[allow(deprecated)]
|
||||
let cwd = current_dir(engine_state, stack)?;
|
||||
let cwd = engine_state.cwd_as_string(Some(stack))?;
|
||||
let path_arg: Spanned<String> = call.req(engine_state, stack, 0)?;
|
||||
|
||||
let path_no_whitespace = &path_arg
|
||||
|
Reference in New Issue
Block a user