From 5de19d2e843bdf4472334f34c01df6236df586fb Mon Sep 17 00:00:00 2001 From: Fabian Boehm Date: Wed, 2 Aug 2023 21:21:46 +0200 Subject: [PATCH] Remove broken `&` Fixes the build --- fish-rust/src/io.rs | 2 +- fish-rust/src/topic_monitor.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fish-rust/src/io.rs b/fish-rust/src/io.rs index aaf9390fa..bb8c41a24 100644 --- a/fish-rust/src/io.rs +++ b/fish-rust/src/io.rs @@ -344,7 +344,7 @@ pub fn create(buffer_limit: usize, target: RawFd) -> Option> { // 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 // from direct buffer transfers. - match make_fd_nonblocking(&pipes.read.fd()) { + match make_fd_nonblocking(pipes.read.fd()) { Ok(_) => (), Err(e) => { FLOG!(warning, PIPE_ERROR); diff --git a/fish-rust/src/topic_monitor.rs b/fish-rust/src/topic_monitor.rs index 734770dee..fbf675507 100644 --- a/fish-rust/src/topic_monitor.rs +++ b/fish-rust/src/topic_monitor.rs @@ -212,7 +212,7 @@ pub fn new() -> binary_semaphore_t { // 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. if cfg!(feature = "FISH_TSAN_WORKAROUNDS") { - let _ = make_fd_nonblocking(&pipes_.read.fd()); + let _ = make_fd_nonblocking(pipes_.read.fd()); } } binary_semaphore_t {