rebase

Author: xunilrj

test/src/e2e_vm_tests/test_programs/should_fail/array_wrong_elements_types/stdout.snap

@@ -12,7 +12,7 @@ stderr:
 error
   --> test/src/e2e_vm_tests/test_programs/should_fail/array_wrong_elements_types/src/main.sw:41:27
    |
-39 | 
+39 |     // unexpected Option<u8>
 40 |     let a = [None, Some(1), Some(1u8)];
 41 |     let _b: Option<u16> = a[1];
    |                           ^^^^ Mismatched types.
@@ -27,7 +27,7 @@ ____
 error
   --> test/src/e2e_vm_tests/test_programs/should_fail/array_wrong_elements_types/src/main.sw:45:18
    |
-43 | 
+43 |     // unexpected u8
 44 |     let a = [8, 256u16, 8u8];
 45 |     let b: u32 = a[2];
    |                  ^^^^ Mismatched types.
@@ -42,7 +42,7 @@ ____
 error
   --> test/src/e2e_vm_tests/test_programs/should_fail/array_wrong_elements_types/src/main.sw:9:22
    |
- 7 | 
+ 7 | fn main() {
  8 |     // unexpected u16
  9 |     let a: [u8;1] = [1u16];
    |                      ^^^^ Mismatched types.
@@ -65,13 +65,14 @@ expected: u8
 found:    u16.
 
 13 |     let a = [1, 2u8, 3u16, 4u32, 5u64];
+14 | 
    |
 ____
 
 error
   --> test/src/e2e_vm_tests/test_programs/should_fail/array_wrong_elements_types/src/main.sw:13:22
    |
-11 | 
+11 |     // unexpected u16
 12 |     let _ = [1u8, 1u16];
 13 |     let a = [1, 2u8, 3u16, 4u32, 5u64];
    |                      ^^^^ Mismatched types.
@@ -86,7 +87,7 @@ ____
 error
   --> test/src/e2e_vm_tests/test_programs/should_fail/array_wrong_elements_types/src/main.sw:13:28
    |
-11 | 
+11 |     // unexpected u16
 12 |     let _ = [1u8, 1u16];
 13 |     let a = [1, 2u8, 3u16, 4u32, 5u64];
    |                            ^^^^ Mismatched types.
@@ -101,7 +102,7 @@ ____
 error
   --> test/src/e2e_vm_tests/test_programs/should_fail/array_wrong_elements_types/src/main.sw:13:34
    |
-11 | 
+11 |     // unexpected u16
 12 |     let _ = [1u8, 1u16];
 13 |     let a = [1, 2u8, 3u16, 4u32, 5u64];
    |                                  ^^^^ Mismatched types.
@@ -221,7 +222,7 @@ ____
 error
   --> test/src/e2e_vm_tests/test_programs/should_fail/array_wrong_elements_types/src/main.sw:32:20
    |
-30 | 
+30 |     // unexpected str
 31 |     let _ = [1, "", 1u16];
 32 |     let _ = [1, 2, "hello"];
    |                    ^^^^^^^ Mismatched types.
@@ -236,21 +237,22 @@ ____
 error
   --> test/src/e2e_vm_tests/test_programs/should_fail/array_wrong_elements_types/src/main.sw:33:25
    |
-31 | 
+31 |     let _ = [1, "", 1u16];
 32 |     let _ = [1, 2, "hello"];
 33 |     let _ = [1, return, "", 1u16];
    |                         ^^ Mismatched types.
 expected: u16
 found:    str.
 
 34 |     let _ = [1, "", return, 1u16];
+35 | 
    |
 ____
 
 error
   --> test/src/e2e_vm_tests/test_programs/should_fail/array_wrong_elements_types/src/main.sw:34:17
    |
-32 | 
+32 |     let _ = [1, 2, "hello"];
 33 |     let _ = [1, return, "", 1u16];
 34 |     let _ = [1, "", return, 1u16];
    |                 ^^ Mismatched types.
@@ -288,6 +290,7 @@ expected: u16
 found:    u8.
 
 45 |     let b: u32 = a[2];
+46 | 
    |
 ____
 

test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/stdout.snap

@@ -12,11 +12,12 @@ stderr:
 error
  --> test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw:5:14
   |
-3 | 
+3 | fn main() {
 4 |     // 0x100 does not fit into a u8
 5 |     let _a = 0x100;
   |              ^^^^^ Literal would overflow because its value does not fit into "u8"
 6 |     Vec::<u8>::new().push(_a);
+7 | 
   |
 ____
 
@@ -28,6 +29,7 @@ error
  9 |     let _a = 0x10000;
    |              ^^^^^^^ Literal would overflow because its value does not fit into "u16"
 10 |     Vec::<u16>::new().push(_a);
+11 | 
    |
 ____
 
@@ -39,111 +41,16 @@ error
 13 |     let _a = 0x100000000;
    |              ^^^^^^^^^^^ Literal would overflow because its value does not fit into "u32"
 14 |     Vec::<u32>::new().push(_a);
+15 | 
    |
 ____
 
 error
   --> test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw:20:22
    |
-<<<<<<< HEAD
 18 | 
 19 | fn insufficient_type_check(arg: u64) -> [u32;2] {
 20 |     let res = [1u32, arg];
-=======
-17 | 
-18 |     // Array - different numerics
-19 |     let a = [1, 2u8, 3u16, 4u32, 5u64];
-   |                      ^^^^ Mismatched types.
-expected: u8
-found:    u16.
-
-20 | 
-21 |     // Array - unspecified generic structs
-   |
-____
-
-error
-  --> test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw:19:28
-   |
-17 | 
-18 |     // Array - different numerics
-19 |     let a = [1, 2u8, 3u16, 4u32, 5u64];
-   |                            ^^^^ Mismatched types.
-expected: u8
-found:    u32.
-
-20 | 
-21 |     // Array - unspecified generic structs
-   |
-____
-
-error
-  --> test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw:19:34
-   |
-17 | 
-18 |     // Array - different numerics
-19 |     let a = [1, 2u8, 3u16, 4u32, 5u64];
-   |                                  ^^^^ Mismatched types.
-expected: u8
-found:    u64.
-
-20 | 
-21 |     // Array - unspecified generic structs
-   |
-____
-
-error
-  --> test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw:23:27
-   |
-21 |     // Array - unspecified generic structs
-22 |     let a = [None, Some(1), Some(1u8)];
-23 |     let _b: Option<u16> = a[1];
-   |                           ^^^^ Mismatched types.
-expected: Option<u16>
-found:    Option<u8>.
-help: Variable declaration's type annotation does not match up with the assigned expression's type.
-24 | 
-25 |     // Wrong cast
-   |
-____
-
-error
-  --> test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw:26:25
-   |
-24 | 
-25 |     // Wrong cast
-26 |     let a = [8, 256u16, 8u8];
-   |                         ^^^ Mismatched types.
-expected: u16
-found:    u8.
-
-27 |     let b: u32 = a[2];
-28 | }
-   |
-____
-
-error
-  --> test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw:27:18
-   |
-25 |     // Wrong cast
-26 |     let a = [8, 256u16, 8u8];
-27 |     let b: u32 = a[2];
-   |                  ^^^^ Mismatched types.
-expected: u32
-found:    u16.
-help: Variable declaration's type annotation does not match up with the assigned expression's type.
-28 | }
-29 | 
-   |
-____
-
-error
-  --> test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw:31:22
-   |
-29 | 
-30 | fn insufficient_type_check(arg: u64) -> [u32;2] {
-31 |     let res = [1u32, arg];
->>>>>>> 911ef0eb7 (fix code snippet for old diagnostics)
    |                      ^^^ Mismatched types.
 expected: u32
 found:    u64.
@@ -153,45 +60,5 @@ found:    u64.
    |
 ____
 
-<<<<<<< HEAD
   Aborting due to 4 errors.
-=======
-error
- --> test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw:4:14
-  |
-2 | 
-3 | fn main() {
-4 |     let _a = 0x100;
-  |              ^^^^^ Literal would overflow because its value does not fit into "u8"
-5 |     Vec::<u8>::new().push(_a);
-6 | 
-  |
-____
-
-error
-  --> test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw:8:14
-   |
- 6 | 
- 7 |     // u16
- 8 |     let _a = 0x10000;
-   |              ^^^^^^^ Literal would overflow because its value does not fit into "u16"
- 9 |     Vec::<u16>::new().push(_a);
-10 | 
-   |
-____
-
-error
-  --> test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw:12:14
-   |
-10 | 
-11 |     // u32
-12 |     let _a = 0x100000000;
-   |              ^^^^^^^^^^^ Literal would overflow because its value does not fit into "u32"
-13 |     Vec::<u32>::new().push(_a);
-14 | 
-   |
-____
-
-  Aborting due to 12 errors.
->>>>>>> 911ef0eb7 (fix code snippet for old diagnostics)
 error: Failed to compile type_check_analyze_errors