From 4b3e4305a82a73111abc1e5e757eff889c43c7e1 Mon Sep 17 00:00:00 2001 From: Philippe Llerena Date: Fri, 2 May 2025 13:55:07 +0200 Subject: [PATCH] refactor(autoload): rename should_run_autoload to nu_autoload_on_command for clarity --- src/config_files.rs | 4 ++-- src/run.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config_files.rs b/src/config_files.rs index f351bb8d9a..23c0575406 100644 --- a/src/config_files.rs +++ b/src/config_files.rs @@ -173,7 +173,7 @@ fn read_and_sort_directory(path: &Path) -> Result> { Ok(entries) } -pub(crate) fn should_run_autoload(engine_state: &EngineState, stack: &Stack) -> bool { +pub(crate) fn nu_autoload_on_command(engine_state: &EngineState, stack: &Stack) -> bool { let env_vars = stack.get_env_vars(engine_state); env_vars .get("NU_AUTOLOAD_ON_COMMAND") @@ -195,7 +195,7 @@ pub(crate) fn read_vendor_autoload_files(engine_state: &mut EngineState, stack: column!() ); let mut autoload_dirs = get_vendor_autoload_dirs(engine_state); - if should_run_autoload(engine_state, stack) { + if nu_autoload_on_command(engine_state, stack) { // Check for custom autoload dir in Nushell's environment let env_vars = stack.get_env_vars(engine_state); if let Some(val) = env_vars.get("NU_VENDOR_AUTOLOAD_DIR") { diff --git a/src/run.rs b/src/run.rs index c4216f3dc9..48c2ab4db1 100644 --- a/src/run.rs +++ b/src/run.rs @@ -1,6 +1,6 @@ use crate::{ command, - config_files::{self, read_vendor_autoload_files, setup_config, should_run_autoload}, + config_files::{self, read_vendor_autoload_files, setup_config, nu_autoload_on_command}, }; use log::trace; #[cfg(feature = "plugin")] @@ -78,7 +78,7 @@ pub(crate) fn run_commands( perf!("read login.nu", start_time, use_color); // Only run vendor autoload if NU_AUTOLOAD_ON_COMMAND is set to true - if should_run_autoload(engine_state, &stack) { + if nu_autoload_on_command(engine_state, &stack) { read_vendor_autoload_files(engine_state, &mut stack); if let Err(e) = engine_state.merge_env(&mut stack) { report_shell_error(engine_state, &e);