From cc58728dc9ebe5e7e61c5a606d2556ba9a0ca62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com> Date: Wed, 21 Feb 2018 22:22:16 +0100 Subject: [PATCH] Fixed macro output and some rustfmt --- klee/src/ll.rs | 13 ++----------- klee/tasks.txt | 4 ++-- macros/src/lib.rs | 2 +- macros/src/trans.rs | 14 ++++---------- 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/klee/src/ll.rs b/klee/src/ll.rs index 7c60f6f..d814410 100644 --- a/klee/src/ll.rs +++ b/klee/src/ll.rs @@ -4,11 +4,7 @@ use cty::{c_char, c_void}; extern "C" { pub fn abort() -> !; pub fn klee_assume(cond: bool); - pub fn klee_make_symbolic( - ptr: *mut c_void, - size: usize, - name: *const c_char, - ); + pub fn klee_make_symbolic(ptr: *mut c_void, size: usize, name: *const c_char); } #[cfg(not(feature = "klee_mode"))] @@ -20,9 +16,4 @@ pub unsafe fn abort() -> ! { pub unsafe fn klee_assume(_cond: bool) {} #[cfg(not(feature = "klee_mode"))] -pub unsafe fn klee_make_symbolic( - _ptr: *mut c_void, - _size: usize, - _name: *const c_char, -) { -} +pub unsafe fn klee_make_symbolic(_ptr: *mut c_void, _size: usize, _name: *const c_char) {} diff --git a/klee/tasks.txt b/klee/tasks.txt index fb62ad3..b2f6e50 100644 --- a/klee/tasks.txt +++ b/klee/tasks.txt @@ -1,2 +1,2 @@ -// autogenertated file - [] \ No newline at end of file +// autogenerated file +["EXTI3", "EXTI2", "EXTI1"] \ No newline at end of file diff --git a/macros/src/lib.rs b/macros/src/lib.rs index 27829e9..aad020f 100644 --- a/macros/src/lib.rs +++ b/macros/src/lib.rs @@ -200,7 +200,7 @@ fn run(ts: TokenStream) -> Result<TokenStream> { let path = Path::new("klee/tasks.txt"); let mut file = File::create(path).unwrap(); - write!(file, "// autogenertated file \n {:?}", tasks).unwrap(); + write!(file, "// autogenerated file\n{:?}", tasks).unwrap(); } Ok(format!("{}", tokens) .parse() diff --git a/macros/src/trans.rs b/macros/src/trans.rs index 70b553d..8d0e9e6 100644 --- a/macros/src/trans.rs +++ b/macros/src/trans.rs @@ -27,12 +27,7 @@ pub fn app(app: &App, ownerships: &Ownerships) -> Tokens { quote!(#(#root)*) } -fn idle( - app: &App, - ownerships: &Ownerships, - main: &mut Vec<Tokens>, - root: &mut Vec<Tokens>, -) { +fn idle(app: &App, ownerships: &Ownerships, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) { let krate = krate(); let mut mod_items = vec![]; @@ -519,10 +514,9 @@ fn tasks(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) { for rname in &task.resources { let ceiling = ownerships[rname].ceiling(); let _rname = Ident::new(format!("_{}", rname.as_ref())); - let resource = app.resources.get(rname).expect(&format!( - "BUG: resource {} has no definition", - rname - )); + let resource = app.resources + .get(rname) + .expect(&format!("BUG: resource {} has no definition", rname)); let ty = &resource.ty; let _static = if resource.expr.is_some() { -- GitLab