From 15b08cbcab75983e084313267d14e2137b7ce280 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 1 Sep 2024 14:01:18 +0200
Subject: [PATCH] Make import style less noisy

---
 src/builtins/fg.rs | 3 +--
 src/exec.rs        | 3 +--
 src/reader.rs      | 5 ++---
 src/wildcard.rs    | 3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/builtins/fg.rs b/src/builtins/fg.rs
index 49cc86de0..3dd092f39 100644
--- a/src/builtins/fg.rs
+++ b/src/builtins/fg.rs
@@ -1,7 +1,6 @@
 //! Implementation of the fg builtin.
 
 use crate::fds::make_fd_blocking;
-use crate::input_common::terminal_protocols_disable_ifn;
 use crate::reader::reader_write_title;
 use crate::tokenizer::tok_command;
 use crate::wutil::perror;
@@ -148,7 +147,7 @@ pub fn fg(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Optio
         let job_group = job.group();
         job_group.set_is_foreground(true);
         if job.entitled_to_terminal() {
-            terminal_protocols_disable_ifn();
+            crate::input_common::terminal_protocols_disable_ifn();
         }
         let tmodes = job_group.tmodes.borrow();
         if job_group.wants_terminal() && tmodes.is_some() {
diff --git a/src/exec.rs b/src/exec.rs
index 3aa2d96e4..7ccdf94e0 100644
--- a/src/exec.rs
+++ b/src/exec.rs
@@ -24,7 +24,6 @@
 #[cfg(FISH_USE_POSIX_SPAWN)]
 use crate::fork_exec::spawn::PosixSpawner;
 use crate::function::{self, FunctionProperties};
-use crate::input_common::terminal_protocols_disable_ifn;
 use crate::io::{
     BufferedOutputStream, FdOutputStream, IoBufferfill, IoChain, IoClose, IoMode, IoPipe,
     IoStreams, OutputStream, SeparatedBuffer, StringOutputStream,
@@ -73,7 +72,7 @@ pub fn exec_job(parser: &Parser, job: &Job, block_io: IoChain) -> bool {
     }
 
     if job.entitled_to_terminal() {
-        terminal_protocols_disable_ifn();
+        crate::input_common::terminal_protocols_disable_ifn();
     }
 
     // Handle an exec call.
diff --git a/src/reader.rs b/src/reader.rs
index 56e209878..eb2aa99b0 100644
--- a/src/reader.rs
+++ b/src/reader.rs
@@ -78,8 +78,7 @@
 use crate::input_common::IN_MIDNIGHT_COMMANDER;
 use crate::input_common::IN_WEZTERM;
 use crate::input_common::{
-    terminal_protocols_disable_ifn, terminal_protocols_enable_ifn, CharEvent, CharInputStyle,
-    InputData, ReadlineCmd, IS_TMUX,
+    terminal_protocols_enable_ifn, CharEvent, CharInputStyle, InputData, ReadlineCmd, IS_TMUX,
 };
 use crate::io::IoChain;
 use crate::kill::{kill_add, kill_replace, kill_yank, kill_yank_rotate};
@@ -824,7 +823,7 @@ pub fn reader_init() -> impl ScopeGuarding<Target = ()> {
     }
     ScopeGuard::new((), move |()| {
         restore_term_mode();
-        terminal_protocols_disable_ifn();
+        crate::input_common::terminal_protocols_disable_ifn();
     })
 }
 
diff --git a/src/wildcard.rs b/src/wildcard.rs
index 9c9be1572..0822cd2c6 100644
--- a/src/wildcard.rs
+++ b/src/wildcard.rs
@@ -448,7 +448,6 @@ mod expander {
 
     use crate::{
         common::scoped_push,
-        input_common::terminal_protocols_disable_ifn,
         path::append_path_component,
         threads::is_main_thread,
         wutil::{dir_iter::DirIter, normalize_path, DevInode},
@@ -595,7 +594,7 @@ pub fn expand(&mut self, base_dir: &wstr, wc: &wstr, effective_prefix: &wstr) {
                 }
 
                 if is_main_thread() {
-                    terminal_protocols_disable_ifn();
+                    crate::input_common::terminal_protocols_disable_ifn();
                 }
 
                 // return "." and ".." entries if we're doing completions