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.

crates/nu-cli/src/config_files.rs

@@ -177,36 +177,36 @@ pub fn add_plugin_file(
     use std::path::Path;
 
     let working_set = StateWorkingSet::new(engine_state);
-    #[allow(deprecated)]
-    let cwd = working_set.get_cwd();
 
-    if let Some(plugin_file) = plugin_file {
-        let path = Path::new(&plugin_file.item);
-        let path_dir = path.parent().unwrap_or(path);
-        // Just try to canonicalize the directory of the plugin file first.
-        if let Ok(path_dir) = canonicalize_with(path_dir, &cwd) {
-            // Try to canonicalize the actual filename, but it's ok if that fails. The file doesn't
-            // have to exist.
-            let path = path_dir.join(path.file_name().unwrap_or(path.as_os_str()));
-            let path = canonicalize_with(&path, &cwd).unwrap_or(path);
-            engine_state.plugin_path = Some(path)
-        } else {
-            // It's an error if the directory for the plugin file doesn't exist.
-            report_error(
-                &working_set,
-                &ParseError::FileNotFound(
-                    path_dir.to_string_lossy().into_owned(),
-                    plugin_file.span,
-                ),
-            );
+    if let Ok(cwd) = engine_state.cwd_as_string(None) {
+        if let Some(plugin_file) = plugin_file {
+            let path = Path::new(&plugin_file.item);
+            let path_dir = path.parent().unwrap_or(path);
+            // Just try to canonicalize the directory of the plugin file first.
+            if let Ok(path_dir) = canonicalize_with(path_dir, &cwd) {
+                // Try to canonicalize the actual filename, but it's ok if that fails. The file doesn't
+                // have to exist.
+                let path = path_dir.join(path.file_name().unwrap_or(path.as_os_str()));
+                let path = canonicalize_with(&path, &cwd).unwrap_or(path);
+                engine_state.plugin_path = Some(path)
+            } else {
+                // It's an error if the directory for the plugin file doesn't exist.
+                report_error(
+                    &working_set,
+                    &ParseError::FileNotFound(
+                        path_dir.to_string_lossy().into_owned(),
+                        plugin_file.span,
+                    ),
+                );
+            }
+        } else if let Some(mut plugin_path) = nu_path::config_dir() {
+            // Path to store plugins signatures
+            plugin_path.push(storage_path);
+            let mut plugin_path = canonicalize_with(&plugin_path, &cwd).unwrap_or(plugin_path);
+            plugin_path.push(PLUGIN_FILE);
+            let plugin_path = canonicalize_with(&plugin_path, &cwd).unwrap_or(plugin_path);
+            engine_state.plugin_path = Some(plugin_path);
         }
-    } else if let Some(mut plugin_path) = nu_path::config_dir() {
-        // Path to store plugins signatures
-        plugin_path.push(storage_path);
-        let mut plugin_path = canonicalize_with(&plugin_path, &cwd).unwrap_or(plugin_path);
-        plugin_path.push(PLUGIN_FILE);
-        let plugin_path = canonicalize_with(&plugin_path, &cwd).unwrap_or(plugin_path);
-        engine_state.plugin_path = Some(plugin_path);
     }
 }
 
@@ -236,8 +236,7 @@ pub fn eval_config_contents(
             engine_state.file = prev_file;
 
             // Merge the environment in case env vars changed in the config
-            #[allow(deprecated)]
-            match nu_engine::env::current_dir(engine_state, stack) {
+            match engine_state.cwd(Some(stack)) {
                 Ok(cwd) => {
                     if let Err(e) = engine_state.merge_env(stack, cwd) {
                         let working_set = StateWorkingSet::new(engine_state);
@@ -274,8 +273,9 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -
 
     let start_time = std::time::Instant::now();
 
-    #[allow(deprecated)]
-    let cwd = engine_state.current_work_dir();
+    let Ok(cwd) = engine_state.cwd_as_string(None) else {
+        return false;
+    };
 
     let Some(config_dir) = nu_path::config_dir().and_then(|mut dir| {
         dir.push(storage_path);

crates/nu-cli/src/eval_file.rs

@@ -1,8 +1,7 @@
 use crate::util::eval_source;
 use log::{info, trace};
 use miette::{IntoDiagnostic, Result};
-#[allow(deprecated)]
-use nu_engine::{convert_env_values, current_dir, eval_block};
+use nu_engine::{convert_env_values, eval_block};
 use nu_parser::parse;
 use nu_path::canonicalize_with;
 use nu_protocol::{
@@ -30,8 +29,7 @@ pub fn evaluate_file(
         std::process::exit(1);
     }
 
-    #[allow(deprecated)]
-    let cwd = current_dir(engine_state, stack)?;
+    let cwd = engine_state.cwd_as_string(Some(stack))?;
 
     let file_path = canonicalize_with(&path, cwd).unwrap_or_else(|e| {
         let working_set = StateWorkingSet::new(engine_state);