github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 10:01:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make import style less noisy

Browse Source
This commit is contained in:
Johannes Altmanninger 2024-09-01 14:01:18 +02:00
parent 50a6dfd10d
commit 15b08cbcab
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/builtins/fg.rs
View File

@ -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() {

3
src/exec.rs
View File

@ -24,7 +24,6 @@ use crate::fork_exec::postfork::{
#[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.

5
src/reader.rs
View File

@ -78,8 +78,7 @@ use crate::input_common::IN_ITERM_PRE_CSI_U;
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();
})
}

3
src/wildcard.rs
View File

@ -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 @@ mod expander {
}
if is_main_thread() {
terminal_protocols_disable_ifn();
crate::input_common::terminal_protocols_disable_ifn();
}
// return "." and ".." entries if we're doing completions