arnekeller/cursive
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/cursive.git synced 2024-11-23 17:35:00 +00:00
Code Issues Projects Releases Wiki Activity

replace CbFunc with Box<FnOnce()> (#351)

Browse Source 
Since Rust 1.35, Box<FnOnce()> compiles, we can remove the workaround.
This commit is contained in:
Gergely Nagy 2019-07-05 09:16:26 +02:00 committed by Alexandre Bury
parent babc038e36
commit 74266edf29
3 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/vpv.rs
View File

@ -137,7 +137,7 @@ cargo run --example vpv </dev/zero >/dev/null",
} }
// When we're done, shut down the application // When we're done, shut down the application
cb_sink.send(Box::new(|s: &mut Cursive| s.quit())).unwrap(); cb_sink.send(Box::new(Cursive::quit)).unwrap();
}); });
siv.set_autorefresh(true); siv.set_autorefresh(true);
} }

28
src/cursive.rs
View File

@ -43,8 +43,8 @@ pub struct Cursive {
backend: Box<dyn backend::Backend>, backend: Box<dyn backend::Backend>,
cb_source: Receiver<Box<dyn CbFunc>>, cb_source: Receiver<Box<dyn FnOnce(&mut Cursive) + Send>>,
cb_sink: Sender<Box<dyn CbFunc>>, cb_sink: Sender<Box<dyn FnOnce(&mut Cursive) + Send>>,
// User-provided data. // User-provided data.
user_data: Box<dyn Any>, user_data: Box<dyn Any>,
@ -57,25 +57,7 @@ pub struct Cursive {
pub type ScreenId = usize; pub type ScreenId = usize;
/// Convenient alias to the result of `Cursive::cb_sink`. /// Convenient alias to the result of `Cursive::cb_sink`.
pub type CbSink = Sender<Box<dyn CbFunc>>; pub type CbSink = Sender<Box<dyn FnOnce(&mut Cursive) + Send>>;
/// Asynchronous callback function trait.
///
/// Every `FnOnce(&mut Cursive) -> () + Send` automatically
/// implements this.
///
/// This is a workaround only because `Box<FnOnce()>` is not
/// working and `FnBox` is unstable.
pub trait CbFunc: Send {
/// Calls the function.
fn call_box(self: Box<Self>, _: &mut Cursive);
}
impl<F: FnOnce(&mut Cursive) -> () + Send> CbFunc for F {
fn call_box(self: Box<Self>, siv: &mut Cursive) {
(*self)(siv)
}
}
cfg_if::cfg_if! { cfg_if::cfg_if! {
if #[cfg(feature = "blt-backend")] { if #[cfg(feature = "blt-backend")] {
@ -330,7 +312,7 @@ impl Cursive {
/// let mut siv = Cursive::dummy(); /// let mut siv = Cursive::dummy();
/// ///
/// // quit() will be called during the next event cycle /// // quit() will be called during the next event cycle
/// siv.cb_sink().send(Box::new(|s: &mut Cursive| s.quit())).unwrap(); /// siv.cb_sink().send(Box::new(|s| s.quit())).unwrap();
/// # } /// # }
/// ``` /// ```
pub fn cb_sink(&self) -> &CbSink { pub fn cb_sink(&self) -> &CbSink {
@ -877,7 +859,7 @@ impl Cursive {
// Then, handle any available callback // Then, handle any available callback
while let Ok(cb) = self.cb_source.try_recv() { while let Ok(cb) = self.cb_source.try_recv() {
boring = false; boring = false;
cb.call_box(self); cb(self);
if !self.running { if !self.running {
return true; return true;

2
src/lib.rs
View File

@ -101,7 +101,7 @@ mod utf8;
pub mod backend; pub mod backend;
pub use self::cursive::{CbFunc, CbSink, Cursive, ScreenId}; pub use self::cursive::{CbSink, Cursive, ScreenId};
pub use self::printer::Printer; pub use self::printer::Printer;
pub use self::rect::Rect; pub use self::rect::Rect;
pub use self::vec::Vec2; pub use self::vec::Vec2;