Merge branch 'main' into feat/vec_iterator

starkware-libs · Jan 3, 2025 · 2af5ce4 · 2af5ce4
2 parents a0106b6 + 825b42d
commit 2af5ce4
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 8 deletions.
diff --git a/corelib/src/prelude/v2023_01.cairo b/corelib/src/prelude/v2023_01.cairo
@@ -37,6 +37,7 @@ use crate::traits::{
     Felt252DictValue, Into, Mul, Neg, Not, PanicDestruct, PartialEq, PartialOrd, Rem, Sub, TryInto,
     TupleSize0Copy, TupleSize0Drop,
 };
+use crate::iter::{IntoIterator, Iterator};
 use crate::zeroable::{NonZero, Zeroable};
 use crate::{
     BoolBitAnd, BoolBitOr, BoolBitXor, BoolFelt252DictValue, BoolIntoFelt252, BoolNot,

diff --git a/corelib/src/prelude/v2023_10.cairo b/corelib/src/prelude/v2023_10.cairo
@@ -23,6 +23,7 @@ pub use crate::traits::{
     Add, BitAnd, BitNot, BitOr, BitXor, Copy, Default, Destruct, Div, DivRem, Drop,
     Felt252DictValue, Into, Mul, Neg, Not, PanicDestruct, PartialEq, PartialOrd, Rem, Sub, TryInto,
 };
+pub use crate::iter::{IntoIterator, Iterator};
 pub use crate::zeroable::NonZero;
 pub use crate::{
     RangeCheck, SegmentArena, assert, bool, felt252, keccak, math, starknet, to_byte_array, usize,

diff --git a/corelib/src/prelude/v2024_07.cairo b/corelib/src/prelude/v2024_07.cairo
@@ -16,6 +16,7 @@ pub use crate::traits::{
     Add, Copy, Default, Destruct, Div, DivRem, Drop, Felt252DictValue, Into, Mul, Neg, Not,
     PanicDestruct, PartialEq, PartialOrd, Rem, Sub, TryInto,
 };
+pub use crate::iter::{IntoIterator, Iterator};
 pub use crate::{assert, bool, felt252, starknet, usize};
 
 pub use crate::zeroable::NonZero;
diff --git a/corelib/src/test/array_test.cairo b/corelib/src/test/array_test.cairo
@@ -1,4 +1,3 @@
-use crate::iter::{IntoIterator, Iterator};
 use crate::test::test_utils::assert_eq;
 
 #[test]

diff --git a/corelib/src/test/language_features/for_test.cairo b/corelib/src/test/language_features/for_test.cairo
@@ -1,5 +1,3 @@
-use crate::iter::IntoIterator;
-
 #[test]
 fn test_for_loop_array_sum() {
     let mut sum = 0;

diff --git a/corelib/src/test/option_test.cairo b/corelib/src/test/option_test.cairo
@@ -1,5 +1,3 @@
-use crate::iter::{IntoIterator, Iterator};
-
 #[test]
 fn test_option_some_expect() {
     assert!(Option::Some(42).expect('') == 42);

diff --git a/crates/cairo-lang-plugins/src/plugins/compile_error.rs b/crates/cairo-lang-plugins/src/plugins/compile_error.rs
@@ -27,8 +27,7 @@ impl MacroPlugin for CompileErrorPlugin {
                 let ast::Expr::String(err_message) = compilation_error_arg else {
                     return PluginResult::diagnostic_only(PluginDiagnostic::error(
                         &compilation_error_arg,
-                        "`compiler_error!` argument must be an unnamed string argument."
-                            .to_string(),
+                        "`compile_error!` argument must be an unnamed string argument.".to_string(),
                     ));
                 };
                 return PluginResult::diagnostic_only(PluginDiagnostic::error(

diff --git a/crates/cairo-lang-plugins/src/test_data/compile_error b/crates/cairo-lang-plugins/src/test_data/compile_error
@@ -21,7 +21,7 @@ compile_error!();
 ^^^^^^^^^^^^^^^^^
 
 
-error: `compiler_error!` argument must be an unnamed string argument.
+error: `compile_error!` argument must be an unnamed string argument.
  --> test_src/lib.cairo:3:16
 compile_error!(1);
                ^

diff --git a/docs/other/gas_blog_post.pdf b/docs/other/gas_blog_post.pdf