diff --git a/mux/src/domain.rs b/mux/src/domain.rs index c0a59048c..12109666e 100644 --- a/mux/src/domain.rs +++ b/mux/src/domain.rs @@ -529,10 +529,10 @@ impl portable_pty::MasterPty for FailedSpawnPty { fn get_size(&self) -> anyhow::Result { self.inner.lock().get_size() } - fn try_clone_reader(&self) -> anyhow::Result> { + fn try_clone_reader(&self) -> anyhow::Result> { self.inner.lock().try_clone_reader() } - fn take_writer(&self) -> anyhow::Result> { + fn take_writer(&self) -> anyhow::Result> { self.inner.lock().take_writer() } diff --git a/mux/src/ssh.rs b/mux/src/ssh.rs index 80bf13e58..a3e7055f8 100644 --- a/mux/src/ssh.rs +++ b/mux/src/ssh.rs @@ -973,8 +973,8 @@ impl ChildKiller for WrappedSshChildKiller { } } -type BoxedReader = Box<(dyn Read + Send + 'static)>; -type BoxedWriter = Box<(dyn Write + Send + 'static)>; +type BoxedReader = Box; +type BoxedWriter = Box; pub(crate) struct WrappedSshPty { inner: RefCell, @@ -1071,7 +1071,7 @@ impl portable_pty::MasterPty for WrappedSshPty { } } - fn try_clone_reader(&self) -> anyhow::Result> { + fn try_clone_reader(&self) -> anyhow::Result> { let mut inner = self.inner.borrow_mut(); inner.check_connected()?; match &mut *inner { @@ -1083,7 +1083,7 @@ impl portable_pty::MasterPty for WrappedSshPty { } } - fn take_writer(&self) -> anyhow::Result> { + fn take_writer(&self) -> anyhow::Result> { anyhow::bail!("writer must be created during bootstrap"); } diff --git a/wezterm-dynamic/src/object.rs b/wezterm-dynamic/src/object.rs index 8a5a704ac..a7d1eca6b 100644 --- a/wezterm-dynamic/src/object.rs +++ b/wezterm-dynamic/src/object.rs @@ -44,27 +44,27 @@ impl<'a> Borrow for Value { } } -impl<'a> PartialEq for (dyn ObjectKeyTrait + 'a) { +impl<'a> PartialEq for dyn ObjectKeyTrait + 'a { fn eq(&self, other: &Self) -> bool { self.key().eq(&other.key()) } } -impl<'a> Eq for (dyn ObjectKeyTrait + 'a) {} +impl<'a> Eq for dyn ObjectKeyTrait + 'a {} -impl<'a> PartialOrd for (dyn ObjectKeyTrait + 'a) { +impl<'a> PartialOrd for dyn ObjectKeyTrait + 'a { fn partial_cmp(&self, other: &Self) -> Option { self.key().partial_cmp(&other.key()) } } -impl<'a> Ord for (dyn ObjectKeyTrait + 'a) { +impl<'a> Ord for dyn ObjectKeyTrait + 'a { fn cmp(&self, other: &Self) -> Ordering { self.key().cmp(&other.key()) } } -impl<'a> core::hash::Hash for (dyn ObjectKeyTrait + 'a) { +impl<'a> core::hash::Hash for dyn ObjectKeyTrait + 'a { fn hash(&self, state: &mut H) { self.key().hash(state) } diff --git a/wezterm-gui/src/glyphcache.rs b/wezterm-gui/src/glyphcache.rs index c1a086250..f8674940d 100644 --- a/wezterm-gui/src/glyphcache.rs +++ b/wezterm-gui/src/glyphcache.rs @@ -142,15 +142,15 @@ impl<'a> std::borrow::Borrow for GlyphKey { } } -impl<'a> PartialEq for (dyn GlyphKeyTrait + 'a) { +impl<'a> PartialEq for dyn GlyphKeyTrait + 'a { fn eq(&self, other: &Self) -> bool { self.key().eq(&other.key()) } } -impl<'a> Eq for (dyn GlyphKeyTrait + 'a) {} +impl<'a> Eq for dyn GlyphKeyTrait + 'a {} -impl<'a> std::hash::Hash for (dyn GlyphKeyTrait + 'a) { +impl<'a> std::hash::Hash for dyn GlyphKeyTrait + 'a { fn hash(&self, state: &mut H) { self.key().hash(state) } diff --git a/wezterm-gui/src/shapecache.rs b/wezterm-gui/src/shapecache.rs index 2ce52e1a4..e01ea4d7a 100644 --- a/wezterm-gui/src/shapecache.rs +++ b/wezterm-gui/src/shapecache.rs @@ -98,15 +98,15 @@ impl<'a> std::borrow::Borrow for ShapeCacheKey { } } -impl<'a> PartialEq for (dyn ShapeCacheKeyTrait + 'a) { +impl<'a> PartialEq for dyn ShapeCacheKeyTrait + 'a { fn eq(&self, other: &Self) -> bool { self.key().eq(&other.key()) } } -impl<'a> Eq for (dyn ShapeCacheKeyTrait + 'a) {} +impl<'a> Eq for dyn ShapeCacheKeyTrait + 'a {} -impl<'a> std::hash::Hash for (dyn ShapeCacheKeyTrait + 'a) { +impl<'a> std::hash::Hash for dyn ShapeCacheKeyTrait + 'a { fn hash(&self, state: &mut H) { self.key().hash(state) } diff --git a/wezterm-ssh/src/pty.rs b/wezterm-ssh/src/pty.rs index 175a3a311..258f2a826 100644 --- a/wezterm-ssh/src/pty.rs +++ b/wezterm-ssh/src/pty.rs @@ -62,12 +62,12 @@ impl portable_pty::MasterPty for SshPty { Ok(*self.size.lock().unwrap()) } - fn try_clone_reader(&self) -> anyhow::Result> { + fn try_clone_reader(&self) -> anyhow::Result> { let reader = self.reader.try_clone()?; Ok(Box::new(reader)) } - fn take_writer(&self) -> anyhow::Result> { + fn take_writer(&self) -> anyhow::Result> { let writer = self.writer.try_clone()?; Ok(Box::new(writer)) }