mirror of
https://github.com/nushell/nushell.git
synced 2025-06-20 09:58:15 +02:00
refactor(autoload): rename should_run_autoload to nu_autoload_on_command for clarity
This commit is contained in:
parent
5954c55882
commit
4b3e4305a8
@ -173,7 +173,7 @@ fn read_and_sort_directory(path: &Path) -> Result<Vec<String>> {
|
||||
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") {
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user