diff --git a/mers_lib/src/program/configs/with_base.rs b/mers_lib/src/program/configs/with_base.rs index 3ede8a4..c1136b4 100755 --- a/mers_lib/src/program/configs/with_base.rs +++ b/mers_lib/src/program/configs/with_base.rs @@ -75,7 +75,7 @@ impl Config { for (i, err) in func_errors.into_iter().enumerate() { if let Some(err) = err { e = e - .msg(format!("Error for function #{i}:")) + .msg(format!("Error for function #{}:", i + 1)) .err(err); } } diff --git a/mers_lib/src/program/run/tuple.rs b/mers_lib/src/program/run/tuple.rs index a1304c2..d32c68c 100755 --- a/mers_lib/src/program/run/tuple.rs +++ b/mers_lib/src/program/run/tuple.rs @@ -1,4 +1,4 @@ -use std::sync::Arc; +use std::{collections::VecDeque, sync::Arc}; use colored::Colorize; @@ -20,7 +20,7 @@ impl MersStatement for Tuple { let mut it = if let Some(init_to) = init_to { let mut vec = (0..self.elems.len()) .map(|_| Type::empty()) - .collect::>(); + .collect::>(); for t in init_to.types.iter() { if let Some(t) = t.as_any().downcast_ref::() { if t.0.len() == self.elems.len() { @@ -46,7 +46,7 @@ impl MersStatement for Tuple { v.check( info, if let Some(it) = &mut it { - Some(it.pop().unwrap()) + Some(it.pop_front().unwrap()) } else { None }