Skip to content
Snippets Groups Projects
Commit cc58728d authored by Henrik Tjäder's avatar Henrik Tjäder
Browse files

Fixed macro output and some rustfmt

parent e5c56a00
No related branches found
No related tags found
No related merge requests found
......@@ -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) {}
// autogenertated file
[]
\ No newline at end of file
// autogenerated file
["EXTI3", "EXTI2", "EXTI1"]
\ No newline at end of file
......@@ -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()
......
......@@ -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() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment