Conflict fix.

starkware-libs · Nov 18, 2024 · a69fbd0 · a69fbd0
1 parent c7f98e1
commit a69fbd0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/crates/cairo-lang-semantic/src/expr/test_data/operators b/crates/cairo-lang-semantic/src/expr/test_data/operators
@@ -123,8 +123,8 @@ impl Struct2Index of Index<Struct2, usize, felt252> {
 
 //! > expected_diagnostics
 error: Type `test::Struct1` could not be indexed.
-Candidate `core::ops::index::Index::index` inference failed with: Trait has no implementation in context: core::ops::index::Index::<test::Struct1, ?3>.
-Candidate `core::ops::index::IndexView::index` inference failed with: Trait has no implementation in context: core::ops::index::IndexView::<test::Struct1, ?3>.
+Candidate `Index::index` inference failed with: Trait has no implementation in context: core::ops::index::Index::<test::Struct1, ?3>.
+Candidate `IndexView::index` inference failed with: Trait has no implementation in context: core::ops::index::IndexView::<test::Struct1, ?3>.
  --> lib.cairo:21:15
     let _y1 = x1[0];
               ^***^

diff --git a/crates/cairo-lang-semantic/src/items/tests/early_conform b/crates/cairo-lang-semantic/src/items/tests/early_conform
@@ -981,13 +981,13 @@ impl MyIndexView of IndexView<u64, MyType, ()> {
 
 //! > expected_diagnostics
 error[E0002]: Method `my_into` could not be called on type `core::integer::u16`.
-Candidate `test::MyInto::my_into` inference failed with: Trait has no implementation in context: test::MyInto::<core::integer::u16, ?1>.
+Candidate `MyInto::my_into` inference failed with: Trait has no implementation in context: test::MyInto::<core::integer::u16, ?1>.
  --> lib.cairo:15:13
     x[3_u16.my_into()];
             ^*****^
 
 error[E0002]: Method `my_into` could not be called on type `core::integer::u16`.
-Candidate `test::MyInto::my_into` inference failed with: Trait has no implementation in context: test::MyInto::<core::integer::u16, ?4>.
+Candidate `MyInto::my_into` inference failed with: Trait has no implementation in context: test::MyInto::<core::integer::u16, ?4>.
  --> lib.cairo:16:17
     3_u64[3_u16.my_into()];
                 ^*****^

diff --git a/crates/cairo-lang-semantic/src/items/tests/trait_type b/crates/cairo-lang-semantic/src/items/tests/trait_type
@@ -904,8 +904,8 @@ impl MyImpl of MyTrait {
 
 //! > expected_diagnostics
 error: Type `core::integer::u32` could not be indexed.
-Candidate `core::ops::index::Index::index` inference failed with: Trait has no implementation in context: core::ops::index::Index::<core::integer::u32, ?2>.
-Candidate `core::ops::index::IndexView::index` inference failed with: Trait has no implementation in context: core::ops::index::IndexView::<core::integer::u32, ?2>.
+Candidate `Index::index` inference failed with: Trait has no implementation in context: core::ops::index::Index::<core::integer::u32, ?2>.
+Candidate `IndexView::index` inference failed with: Trait has no implementation in context: core::ops::index::IndexView::<core::integer::u32, ?2>.
  --> lib.cairo:8:9
         x[0];
         ^**^