Merge 1820d5d into df5d194

.gitignore

@@ -32,3 +32,6 @@ forc-plugins/forc-debug/tests/**/Forc.lock
 # Generated files in example directories
 examples/**/*/Forc.lock
 docs/reference/src/code/examples/**/*/Forc.lock
+
+# Insta files
+*.snap.new

sway-core/src/language/ty/declaration/function.rs

@@ -572,15 +572,16 @@ impl TyFunctionSig {
     }
 
     pub fn is_concrete(&self, engines: &Engines) -> bool {
-        self.return_type.is_concrete(engines, IncludeNumeric::No)
+        self.return_type
+            .is_concrete(engines, TreatNumericAs::Concrete)
             && self
                 .parameters
                 .iter()
-                .all(|p| p.is_concrete(engines, IncludeNumeric::No))
+                .all(|p| p.is_concrete(engines, TreatNumericAs::Concrete))
             && self
                 .type_parameters
                 .iter()
-                .all(|p| p.is_concrete(engines, IncludeNumeric::No))
+                .all(|p| p.is_concrete(engines, TreatNumericAs::Concrete))
     }
 
     /// Returns a String representing the function.

sway-core/src/semantic_analysis/ast_node/expression/intrinsic_function.rs

@@ -523,7 +523,7 @@ fn type_check_encode_append(
     };
 
     // only supported types
-    if item_type.is_concrete(engines, IncludeNumeric::Yes) {
+    if item_type.is_concrete(engines, TreatNumericAs::Abstract) {
         match &*engines.te().get(item_type) {
             TypeInfo::Boolean
             | TypeInfo::UnsignedInteger(IntegerBits::Eight)

sway-core/src/semantic_analysis/ast_node/expression/typed_expression.rs

@@ -38,6 +38,7 @@ use crate::{
 use ast_node::declaration::{insert_supertraits_into_namespace, SupertraitOf};
 use either::Either;
 use indexmap::IndexMap;
+use itertools::Itertools;
 use rustc_hash::FxHashSet;
 use std::collections::{HashMap, VecDeque};
 use sway_ast::intrinsics::Intrinsic;
@@ -1858,7 +1859,36 @@ impl ty::TyExpression {
             })
             .collect();
 
-        let elem_type = typed_contents[0].return_type;
+        // choose the best type to be the array elem type
+        use itertools::FoldWhile::{Continue, Done};
+        let elem_type = typed_contents
+            .iter()
+            .fold_while(None, |last, current| match last {
+                None => Continue(Some(current.return_type)),
+                Some(last) => {
+                    if last.is_concrete(engines, TreatNumericAs::Abstract) {
+                        return Done(Some(last));
+                    }
+
+                    if current
+                        .return_type
+                        .is_concrete(engines, TreatNumericAs::Abstract)
+                    {
+                        return Done(Some(current.return_type));
+                    }
+
+                    let last_info = ctx.engines().te().get(last);
+                    let current_info = ctx.engines().te().get(current.return_type);
+                    match (&*last_info, &*current_info) {
+                        (TypeInfo::Numeric, TypeInfo::UnsignedInteger(_)) => {
+                            Done(Some(current.return_type))
+                        }
+                        _ => Continue(Some(last)),
+                    }
+                }
+            })
+            .into_inner();
+        let elem_type = elem_type.unwrap_or_else(|| typed_contents[0].return_type);
 
         let array_count = typed_contents.len();
         Ok(ty::TyExpression {

sway-core/src/semantic_analysis/ast_node/expression/typed_expression/method_application.rs

@@ -60,7 +60,7 @@ pub(crate) fn type_check_method_application(
                 x.return_type
                     .extract_inner_types(engines, IncludeSelf::Yes)
                     .iter()
-                    .any(|x| !x.is_concrete(engines, IncludeNumeric::Yes))
+                    .any(|x| !x.is_concrete(engines, TreatNumericAs::Abstract))
             })
             .unwrap_or_default();
         let needs_second_pass = has_errors || is_not_concrete;

sway-core/src/type_system/id.rs

@@ -27,9 +27,9 @@ pub enum IncludeSelf {
     No,
 }
 
-pub enum IncludeNumeric {
-    Yes,
-    No,
+pub enum TreatNumericAs {
+    Abstract,
+    Concrete,
 }
 
 /// A identifier to uniquely refer to our type terms
@@ -461,27 +461,33 @@ impl TypeId {
         }))
     }
 
-    pub(crate) fn is_concrete(&self, engines: &Engines, include_numeric: IncludeNumeric) -> bool {
+    pub(crate) fn is_concrete(
+        &self,
+        engines: &Engines,
+        numeric_non_concrete: TreatNumericAs,
+    ) -> bool {
         let nested_types = (*self).extract_nested_types(engines);
-        !nested_types.into_iter().any(|x| match include_numeric {
-            IncludeNumeric::Yes => matches!(
-                x,
-                TypeInfo::UnknownGeneric { .. }
-                    | TypeInfo::Custom { .. }
-                    | TypeInfo::Placeholder(..)
-                    | TypeInfo::TraitType { .. }
-                    | TypeInfo::TypeParam(..)
-                    | TypeInfo::Numeric
-            ),
-            IncludeNumeric::No => matches!(
-                x,
-                TypeInfo::UnknownGeneric { .. }
-                    | TypeInfo::Custom { .. }
-                    | TypeInfo::Placeholder(..)
-                    | TypeInfo::TraitType { .. }
-                    | TypeInfo::TypeParam(..)
-            ),
-        })
+        !nested_types
+            .into_iter()
+            .any(|x| match numeric_non_concrete {
+                TreatNumericAs::Abstract => matches!(
+                    x,
+                    TypeInfo::UnknownGeneric { .. }
+                        | TypeInfo::Custom { .. }
+                        | TypeInfo::Placeholder(..)
+                        | TypeInfo::TraitType { .. }
+                        | TypeInfo::TypeParam(..)
+                        | TypeInfo::Numeric
+                ),
+                TreatNumericAs::Concrete => matches!(
+                    x,
+                    TypeInfo::UnknownGeneric { .. }
+                        | TypeInfo::Custom { .. }
+                        | TypeInfo::Placeholder(..)
+                        | TypeInfo::TraitType { .. }
+                        | TypeInfo::TypeParam(..)
+                ),
+            })
     }
 
     /// `check_type_parameter_bounds` does two types of checks. Lets use the example below for demonstrating the two checks:

sway-core/src/type_system/priv_prelude.rs

@@ -16,6 +16,6 @@ pub use super::{
         type_parameter::TypeParameter,
     },
     engine::TypeEngine,
-    id::{IncludeNumeric, IncludeSelf, TypeId},
+    id::{IncludeSelf, TreatNumericAs, TypeId},
     info::{AbiEncodeSizeHint, AbiName, TypeInfo, TypeSourceInfo},
 };

test/Cargo.toml

@@ -19,7 +19,10 @@ forc-tracing = { path = "../forc-tracing" }
 fuel-vm = { workspace = true, features = ["random"] }
 futures = "0.3.24"
 gag = "1.0"
+glob = "0.3.1"
 hex = "0.4.3"
+insta = "1.39.0"
+libtest-mimic = "0.7.3"
 miden = "0.3.0"
 prettydiff = "0.6"
 rand = "0.8"
@@ -35,3 +38,9 @@ textwrap = "0.16.0"
 tokio = "1.12"
 toml = { version = "0.7", features = ["parse"] }
 tracing = "0.1"
+vte = "0.13.0"
+
+[[test]]
+name = "tests"
+path = "tests/tests.rs"
+harness = false

test/src/e2e_vm_tests/README.md

@@ -3,6 +3,7 @@
 In order to minimize compilation time of individual tests, strive to reduce dependencies in tests.
 
 To achieve that, follow these guidelines:
+
 - Use `implicit-std = false` if dependency on `core` is not needed. This is often possible when testing `should_pass/language` features.
 - If the dependency on `core` is not needed, instead of using the project type `script`, that will, because of the encoding, depend on `core`, try using `library` instead.
 - Do not use `std` just to conveniently get an arbitrary type or trait. E.g., if a test requires an arbitrary type or trait, go with `struct Dummy {}` or `trait Trait {}` instead of importing `Option` or `Hash`.
@@ -87,3 +88,17 @@ SWAY_TEST_VERBOSE=true cargo run [pattern]
 ```
 
 from the `sway/test` directory.
+
+# Snapshot tests
+
+When an "e2e" test has a file named `snapshot.toml` it will run as `cargo insta` snapshot tests.
+These tests can be run as normal: `cargo r -p test`, and in two new ways:
+
+```
+> cargo t -p test
+> cargo insta test
+```
+
+Snapshots can be reviewed using normal "cargo insta" workflow (see [insta.rs](https://insta.rs/)).
+
+For the moment, there is no configuration for `snapshot.toml`, so they are just empty files.

test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/snapshot.toml

@@ -0,0 +1 @@
+

test/src/e2e_vm_tests/test_programs/should_fail/type_check_analyze_errors/src/main.sw

@@ -1,7 +1,6 @@
 script;
 
 fn main() {
-    // u8
     let _a = 0x100;
     Vec::<u8>::new().push(_a);
 
@@ -15,4 +14,20 @@ fn main() {
 
     // Array
     let a = [1, 2, "hello"];
+
+    // Array - different numerics
+    let a = [1, 2u8, 3u16, 4u32, 5u64];
+
+    // Array - unspecified generic structs
+    let a = [None, Some(1), Some(1u8)];
+    let _b: Option<u16> = a[1];
+
+    // Wrong cast
+    let a = [8, 256u16, 8u8];
+    let b: u32 = a[2];
+}
+
+fn insufficient_type_check(arg: u64) -> [u32;2] {
+    let res = [1u32, arg];
+    res
 }