diff --git a/tools/cheat-builder/make-acl.rs b/tools/cheat-builder/make-acl.rs index 1c08590..c229f8a 100644 --- a/tools/cheat-builder/make-acl.rs +++ b/tools/cheat-builder/make-acl.rs @@ -8,7 +8,6 @@ type Module = Vec; type LockKey = Vec; type LockHole = (String, Vec< LockKey >); -#[derive(Clone)] #[derive(Default)] struct Lock { name: String, @@ -319,7 +318,7 @@ fn incr( ch: char, ctx: &mut ParserCtx ) { ParserState::WaitLock | ParserState::ReadHole | ParserState::NeedPart => { ctx.state = ParserState::ReadLock; if ctx.currlock.is_some() { - let currlock = ctx.currlock.clone().unwrap(); + let currlock = ctx.currlock.take().unwrap(); ctx.locks.push( currlock ); } let tmp = Lock { @@ -630,7 +629,7 @@ fn transform<'a>( list: &'a Vec<(String, String)> ) -> Vec<(&'a String, Vec<(u32 retval.push( (serial, cheats) ); } else { - println!("no data {}", order); + //println!("no data {}", order); } } return retval; @@ -704,6 +703,7 @@ fn main() { let list = loadlist(); let roms = { let ret = transform( &list ); + println!("all rom has {}", ret.len()); let mut idx: BTreeMap<&String, Vec<(u32, Module)>> = BTreeMap::new(); for (serial, cheat) in ret.into_iter() { if cheat.len() == 0 {