wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-10 06:34:17 +03:00
Code Issues Projects Releases Wiki Activity

with_window inner from FnMut -> FnOnce

Browse Source 
Not sure why it was FnMut, but this tidies up an awkward
option/take/unwrap thing in notify().
This commit is contained in:
Wez Furlong 2021-05-05 22:34:51 -07:00
parent fb72338689
commit a44607fb3f
8 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
window/src/os/macos/connection.rs
View File

@ -51,10 +51,10 @@ impl Connection {
pub(crate) fn with_window_inner<
R,
F: FnMut(&mut WindowInner) -> anyhow::Result<R> + Send + 'static,
F: FnOnce(&mut WindowInner) -> anyhow::Result<R> + Send + 'static,
>(
window_id: usize,
mut f: F,
f: F,
) -> promise::Future<R>
where
R: Send + 'static,

3
window/src/os/macos/window.rs
View File

@ -511,14 +511,13 @@ impl WindowOps for Window {
where
Self: Sized,
{
let mut t = Some(t);
Connection::with_window_inner(self.0, move |inner| {
if let Some(window_view) = WindowView::get_this(unsafe { &**inner.view }) {
window_view
.inner
.borrow()
.events
.try_send(WindowEvent::Notification(Box::new(t.take().unwrap())))
.try_send(WindowEvent::Notification(Box::new(t)))
.ok();
}
Ok(())

4
window/src/os/wayland/connection.rs
View File

@ -146,10 +146,10 @@ impl WaylandConnection {
pub(crate) fn with_window_inner<
R,
F: FnMut(&mut WaylandWindowInner) -> anyhow::Result<R> + Send + 'static,
F: FnOnce(&mut WaylandWindowInner) -> anyhow::Result<R> + Send + 'static,
>(
window: usize,
mut f: F,
f: F,
) -> promise::Future<R>
where
R: Send + 'static,

3
window/src/os/wayland/window.rs
View File

@ -625,11 +625,10 @@ impl WindowOps for WaylandWindow {
.ok();
} else {
// Otherwise, get into that thread and write to the queue
let mut t = Some(t);
WaylandConnection::with_window_inner(self.0, move |inner| {
inner
.events
.try_send(WindowEvent::Notification(Box::new(t.take().unwrap())))
.try_send(WindowEvent::Notification(Box::new(t)))
.ok();
Ok(())
});

4
window/src/os/windows/connection.rs
View File

@ -114,10 +114,10 @@ impl Connection {
pub(crate) fn with_window_inner<
R,
F: FnMut(&mut WindowInner) -> anyhow::Result<R> + Send + 'static,
F: FnOnce(&mut WindowInner) -> anyhow::Result<R> + Send + 'static,
>(
window: HWindow,
mut f: F,
f: F,
) -> promise::Future<R>
where
R: Send + 'static,

3
window/src/os/windows/window.rs
View File

@ -567,11 +567,10 @@ impl WindowOps for Window {
.ok();
} else {
// Otherwise, get into that thread and write to the queue
let mut t = Some(t);
Connection::with_window_inner(self.0, move |inner| {
inner
.events
.try_send(WindowEvent::Notification(Box::new(t.take().unwrap())))
.try_send(WindowEvent::Notification(Box::new(t)))
.ok();
Ok(())
});

4
window/src/os/x11/connection.rs
View File

@ -452,10 +452,10 @@ impl XConnection {
pub(crate) fn with_window_inner<
R,
F: FnMut(&mut XWindowInner) -> anyhow::Result<R> + Send + 'static,
F: FnOnce(&mut XWindowInner) -> anyhow::Result<R> + Send + 'static,
>(
window: xcb::xproto::Window,
mut f: F,
f: F,
) -> promise::Future<R>
where
R: Send + 'static,

3
window/src/os/x11/window.rs
View File

@ -915,11 +915,10 @@ impl WindowOps for XWindow {
.ok();
} else {
// Otherwise, get into that thread and write to the queue
let mut t = Some(t);
XConnection::with_window_inner(self.0, move |inner| {
inner
.events
.try_send(WindowEvent::Notification(Box::new(t.take().unwrap())))
.try_send(WindowEvent::Notification(Box::new(t)))
.ok();
Ok(())
});