github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-15 01:23:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove some unsafe impls of Send / Sync

Browse Source 
We no longer have C++ so we don't need these; Rust does the right thing by
default.
This commit is contained in:
Peter Ammon 2024-12-27 14:13:15 -08:00
parent 659c926dbd
commit f6d76d2057
No known key found for this signature in database
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/io.rs
View File

@ -169,7 +169,7 @@ pub enum IoMode {
} }
/// Represents a FD redirection. /// Represents a FD redirection.
pub trait IoData { pub trait IoData: Send + Sync {
/// Type of redirect. /// Type of redirect.
fn io_mode(&self) -> IoMode; fn io_mode(&self) -> IoMode;
/// FD to redirect. /// FD to redirect.
@ -185,24 +185,6 @@ pub trait IoData {
} }
} }
// todo!("this should be safe because of how it's used. Rationalize this better.")
pub trait IoDataSync: IoData + Send + Sync {}
unsafe impl Send for IoClose {}
unsafe impl Send for IoFd {}
unsafe impl Send for IoFile {}
unsafe impl Send for IoPipe {}
unsafe impl Send for IoBufferfill {}
unsafe impl Sync for IoClose {}
unsafe impl Sync for IoFd {}
unsafe impl Sync for IoFile {}
unsafe impl Sync for IoPipe {}
unsafe impl Sync for IoBufferfill {}
impl IoDataSync for IoClose {}
impl IoDataSync for IoFd {}
impl IoDataSync for IoFile {}
impl IoDataSync for IoPipe {}
impl IoDataSync for IoBufferfill {}
pub struct IoClose { pub struct IoClose {
fd: RawFd, fd: RawFd,
} }
@ -520,7 +502,7 @@ fn begin_filling(iobuffer: IoBuffer, fd: OwnedFd) -> FdMonitorItemId {
fd_monitor().add(fd, item_callback) fd_monitor().add(fd, item_callback)
} }
pub type IoDataRef = Arc<dyn IoDataSync>; pub type IoDataRef = Arc<dyn IoData>;
#[derive(Clone, Default)] #[derive(Clone, Default)]
pub struct IoChain(pub Vec<IoDataRef>); pub struct IoChain(pub Vec<IoDataRef>);
@ -529,7 +511,7 @@ impl IoChain {
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
pub fn remove(&mut self, element: &dyn IoDataSync) { pub fn remove(&mut self, element: &dyn IoData) {
let element = element as *const _; let element = element as *const _;
let element = element as *const (); let element = element as *const ();
self.0.retain(|e| { self.0.retain(|e| {