diff --git a/codegen/src/function.rs b/codegen/src/function.rs index 1724e308..0f6a603f 100644 --- a/codegen/src/function.rs +++ b/codegen/src/function.rs @@ -499,11 +499,9 @@ impl ExportedFn { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != #arg_count { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), #arg_count), Position::none()))); - } + debug_assert_eq!(args.len(), #arg_count, + "wrong arg count: {} != {}", + args.len(), #arg_count); #(#unpack_stmts)* #return_expr } @@ -792,11 +790,8 @@ mod generate_tests { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != 0usize { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), 0usize), Position::none()))); - } + debug_assert_eq!(args.len(), 0usize, + "wrong arg count: {} != {}", args.len(), 0usize); Ok(Dynamic::from(do_nothing())) } @@ -839,11 +834,8 @@ mod generate_tests { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != 1usize { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), 1usize), Position::none()))); - } + debug_assert_eq!(args.len(), 1usize, + "wrong arg count: {} != {}", args.len(), 1usize); let arg0 = mem::take(args[0usize]).clone().cast::(); Ok(Dynamic::from(do_something(arg0))) } @@ -883,11 +875,8 @@ mod generate_tests { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != 1usize { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), 1usize), Position::none()))); - } + debug_assert_eq!(args.len(), 1usize, + "wrong arg count: {} != {}", args.len(), 1usize); let arg0 = mem::take(args[0usize]).clone().cast::(); Ok(Dynamic::from(do_something(arg0))) } @@ -920,11 +909,8 @@ mod generate_tests { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != 2usize { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), 2usize), Position::none()))); - } + debug_assert_eq!(args.len(), 2usize, + "wrong arg count: {} != {}", args.len(), 2usize); let arg0 = mem::take(args[0usize]).clone().cast::(); let arg1 = mem::take(args[1usize]).clone().cast::(); Ok(Dynamic::from(add_together(arg0, arg1))) @@ -970,11 +956,8 @@ mod generate_tests { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != 2usize { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), 2usize), Position::none()))); - } + debug_assert_eq!(args.len(), 2usize, + "wrong arg count: {} != {}", args.len(), 2usize); let arg1 = mem::take(args[1usize]).clone().cast::(); let arg0: &mut _ = &mut args[0usize].write_lock::().unwrap(); Ok(Dynamic::from(increment(arg0, arg1))) @@ -1021,11 +1004,8 @@ mod generate_tests { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != 1usize { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), 1usize), Position::none()))); - } + debug_assert_eq!(args.len(), 1usize, + "wrong arg count: {} != {}", args.len(), 1usize); let arg0 = mem::take(args[0usize]).clone().cast::(); Ok(Dynamic::from(special_print(&arg0))) } diff --git a/codegen/src/module.rs b/codegen/src/module.rs index 827607c8..337e38e9 100644 --- a/codegen/src/module.rs +++ b/codegen/src/module.rs @@ -348,11 +348,8 @@ mod generate_tests { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != 0usize { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), 0usize), Position::none()))); - } + debug_assert_eq!(args.len(), 0usize, + "wrong arg count: {} != {}", args.len(), 0usize); Ok(Dynamic::from(get_mystic_number())) } @@ -408,11 +405,8 @@ mod generate_tests { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != 1usize { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), 1usize), Position::none()))); - } + debug_assert_eq!(args.len(), 1usize, + "wrong arg count: {} != {}", args.len(), 1usize); let arg0 = mem::take(args[0usize]).clone().cast::(); Ok(Dynamic::from(add_one_to(arg0))) } @@ -470,11 +464,8 @@ mod generate_tests { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != 2usize { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), 2usize), Position::none()))); - } + debug_assert_eq!(args.len(), 2usize, + "wrong arg count: {} != {}", args.len(), 2usize); let arg0 = mem::take(args[0usize]).clone().cast::(); let arg1 = mem::take(args[1usize]).clone().cast::(); Ok(Dynamic::from(add_together(arg0, arg1))) @@ -672,11 +663,8 @@ mod generate_tests { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != 1usize { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), 1usize), Position::none()))); - } + debug_assert_eq!(args.len(), 1usize, + "wrong arg count: {} != {}", args.len(), 1usize); let arg0 = mem::take(args[0usize]).clone().cast::(); Ok(Dynamic::from(print_out_to(&arg0))) } @@ -734,11 +722,8 @@ mod generate_tests { fn call(&self, args: &mut [&mut Dynamic], pos: Position ) -> Result> { - if args.len() != 1usize { - return Err(Box::new(EvalAltResult::ErrorRuntime( - format!("wrong arg count: {} != {}", - args.len(), 1usize), Position::none()))); - } + debug_assert_eq!(args.len(), 1usize, + "wrong arg count: {} != {}", args.len(), 1usize); let arg0: &mut _ = &mut args[0usize].write_lock::().unwrap(); Ok(Dynamic::from(increment(arg0))) }