From 5781e9391fe3d7d3dabec620cb782d38f5f9cb9e Mon Sep 17 00:00:00 2001 From: Brian Cully Date: Fri, 10 May 2019 11:50:53 -0400 Subject: Update to 0.2.0: Add HandlerArray type. * Create HandlerArray as a safe wrapper around Handler. * Add Cargo features for HandlerArray size. * Move Handler into sub-module. * Add CriticalSection sub-module for architecture dependent support of interrupt-free contexts. * Add build rules to pull in cortex-m support for CriticalSection automatically. --- tests/compile-fail/array.rs | 14 ++++++++++++ tests/compile-fail/handler.rs | 50 ++++++++++++++++++++++++++++++++++++++++++ tests/compile-fail/mutable.rs | 51 ------------------------------------------- 3 files changed, 64 insertions(+), 51 deletions(-) create mode 100644 tests/compile-fail/array.rs create mode 100644 tests/compile-fail/handler.rs delete mode 100644 tests/compile-fail/mutable.rs (limited to 'tests') diff --git a/tests/compile-fail/array.rs b/tests/compile-fail/array.rs new file mode 100644 index 0000000..c5492e8 --- /dev/null +++ b/tests/compile-fail/array.rs @@ -0,0 +1,14 @@ +extern crate clint; + +use clint::cs::Locker; +use clint::HandlerArray; + +fn main() { + let mut hs = HandlerArray::new(); + hs.with_overrides(|new_hs| nested(new_hs)); +} + +fn nested(hs: &HandlerArray) { + let mut c = || println!("Short-lived closure."); + hs.register(0, &mut c) //~ ERROR `c` does not live long enough +} diff --git a/tests/compile-fail/handler.rs b/tests/compile-fail/handler.rs new file mode 100644 index 0000000..fdc464a --- /dev/null +++ b/tests/compile-fail/handler.rs @@ -0,0 +1,50 @@ +extern crate clint; + +use clint::Handler; + +static mut HANDLER: Handler = Handler::new(); + +fn main() { + need_move(); + borrow_error(); + no_borrow_needed(); +} + +fn need_move() { + let x = vec![1, 2, 3]; + let c = || { + println!("x(h-c): {:?}", x); //~ ERROR does not live long enough + }; + unsafe { + HANDLER.replace(&c); + HANDLER.call(); + HANDLER.call(); + } + println!("x(h-o): {:?}", x); +} + +fn borrow_error() { + let x = vec![1, 2, 3]; + let c = move || { + println!("x(h-c): {:?}", x); + }; + unsafe { + HANDLER.replace(&c); + HANDLER.call(); + HANDLER.call(); + } + println!("x(h-o): {:?}", x); //~ ERROR borrow of moved value +} + +fn no_borrow_needed() { + let x = vec![1, 2, 3]; + let c = || { + println!("x(h-c): hi!"); + }; + unsafe { + HANDLER.replace(&c); + HANDLER.call(); + HANDLER.call(); + } + println!("x(h-o): {:?}", x); +} diff --git a/tests/compile-fail/mutable.rs b/tests/compile-fail/mutable.rs deleted file mode 100644 index e888503..0000000 --- a/tests/compile-fail/mutable.rs +++ /dev/null @@ -1,51 +0,0 @@ -extern crate clint; - -use clint::Handler; - -static mut HANDLER: Handler = Handler::new(); - -fn main() { - need_move(); - borrow_error(); - no_borrow_needed(); -} - -fn need_move() { - let x = vec![1, 2, 3]; - let c = || { - //~^ ERROR closure may outlive - println!("x(h-c): {:?}", x); - }; - unsafe { - HANDLER.replace(&c); - HANDLER.call(); - HANDLER.call(); - } - println!("x(h-o): {:?}", x); -} - -fn borrow_error() { - let x = vec![1, 2, 3]; - let c = move || { - println!("x(h-c): {:?}", x); - }; - unsafe { - HANDLER.replace(&c); - HANDLER.call(); - HANDLER.call(); - } - println!("x(h-o): {:?}", x); //~ ERROR borrow of moved value -} - -fn no_borrow_needed() { - let x = vec![1, 2, 3]; - let c = || { - println!("x(h-c): hi!"); - }; - unsafe { - HANDLER.replace(&c); - HANDLER.call(); - HANDLER.call(); - } - println!("x(h-o): {:?}", x); -} -- cgit v1.2.3