diff --git a/src/bin/fish.rs b/src/bin/fish.rs index 8c7042d9e..0525eeb4a 100644 --- a/src/bin/fish.rs +++ b/src/bin/fish.rs @@ -513,7 +513,6 @@ fn throwing_main() -> i32 { features::set_from_string(opts.features.as_utfstr()); fish::env_dispatch::read_terminfo_database(EnvStack::globals()); proc_init(); - fish::env::misc_init(); reader_init(true); // Construct the root parser! diff --git a/src/env/environment.rs b/src/env/environment.rs index cf5da1c39..983cc517f 100644 --- a/src/env/environment.rs +++ b/src/env/environment.rs @@ -842,7 +842,3 @@ pub fn env_init(paths: Option<&ConfigPaths>, do_uvars: bool, default_paths: bool } } } - -/// Various things we need to initialize at run-time that don't really fit any of the other init -/// routines. -pub fn misc_init() {} diff --git a/src/tests/mod.rs b/src/tests/mod.rs index 6cddc8a29..b0de79c17 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -30,7 +30,7 @@ pub mod prelude { use crate::common::{BUILD_DIR, ScopeGuard, ScopeGuarding}; - use crate::env::{env_init, misc_init}; + use crate::env::env_init; use crate::parser::{CancelBehavior, Parser}; use crate::reader::{reader_deinit, reader_init}; use crate::signal::signal_reset_handlers; @@ -104,7 +104,6 @@ pub fn test_init() -> impl ScopeGuarding { crate::threads::init(); proc_init(); env_init(None, true, false); - misc_init(); // Set default signal handlers, so we can ctrl-C out of this. signal_reset_handlers();