github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-28 20:34:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove broken &

Browse Source 
Fixes the build
This commit is contained in:
Fabian Boehm 2023-08-02 21:21:46 +02:00
parent 4728eaf642
commit 5de19d2e84
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fish-rust/src/io.rs
View File

@ -344,7 +344,7 @@ impl IoBufferfill {
// Our buffer will read from the read end of the pipe. This end must be non-blocking. This is // Our buffer will read from the read end of the pipe. This end must be non-blocking. This is
// because our fillthread needs to poll to decide if it should shut down, and also accept input // because our fillthread needs to poll to decide if it should shut down, and also accept input
// from direct buffer transfers. // from direct buffer transfers.
match make_fd_nonblocking(&pipes.read.fd()) { match make_fd_nonblocking(pipes.read.fd()) {
Ok(_) => (), Ok(_) => (),
Err(e) => { Err(e) => {
FLOG!(warning, PIPE_ERROR); FLOG!(warning, PIPE_ERROR);

2
fish-rust/src/topic_monitor.rs
View File

@ -212,7 +212,7 @@ impl binary_semaphore_t {
// receive SIGCHLD and so deadlock. So if tsan is enabled, we mark our fd as non-blocking // receive SIGCHLD and so deadlock. So if tsan is enabled, we mark our fd as non-blocking
// (so reads will never block) and use select() to poll it. // (so reads will never block) and use select() to poll it.
if cfg!(feature = "FISH_TSAN_WORKAROUNDS") { if cfg!(feature = "FISH_TSAN_WORKAROUNDS") {
let _ = make_fd_nonblocking(&pipes_.read.fd()); let _ = make_fd_nonblocking(pipes_.read.fd());
} }
} }
binary_semaphore_t { binary_semaphore_t {