language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 14:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix some tests

Browse source
This commit is contained in:
Richard Feldman 2020-03-06 18:13:24 -05:00
parent 4b642470cf
commit df4533296b
5 changed files with 4 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/gen/tests/helpers/mod.rs
View file

@ -176,14 +176,10 @@ pub fn uniq_expr_with(
.collect(); .collect();
// load builtin values // load builtin values
<<<<<<< HEAD
// TODO what to do with those rigids? // TODO what to do with those rigids?
let (_introduced_rigids, constraint) = let (_introduced_rigids, constraint) =
constrain_imported_values(imports, constraint, &var_store); constrain_imported_values(imports, constraint, &var_store);
=======
let constraint = constrain_imported_values(imports, constraint, &var_store);
>>>>>>> Move solve and uniq tests into other crates
// load builtin types // load builtin types
let mut constraint = load_builtin_aliases(&stdlib.aliases, constraint, &var_store); let mut constraint = load_builtin_aliases(&stdlib.aliases, constraint, &var_store);
@ -263,7 +259,6 @@ pub fn can_expr_with(arena: &Bump, home: ModuleId, expr_str: &str) -> CanExprOut
.collect(); .collect();
//load builtin values //load builtin values
<<<<<<< HEAD
let (_introduced_rigids, constraint) = let (_introduced_rigids, constraint) =
constrain_imported_values(imports, constraint, &var_store); constrain_imported_values(imports, constraint, &var_store);
@ -271,9 +266,6 @@ pub fn can_expr_with(arena: &Bump, home: ModuleId, expr_str: &str) -> CanExprOut
// for var in introduced_rigids { // for var in introduced_rigids {
// output.ftv.insert(var, format!("internal_{:?}", var).into()); // output.ftv.insert(var, format!("internal_{:?}", var).into());
// } // }
=======
let constraint = constrain_imported_values(imports, constraint, &var_store);
>>>>>>> Move solve and uniq tests into other crates
//load builtin types //load builtin types
let mut constraint = let mut constraint =

0
compiler/tests/fixtures/build/interface_with_deps/AStar.roc → compiler/load/tests/fixtures/build/interface_with_deps/AStar.roc vendored
View file

6
compiler/load/tests/helpers/mod.rs
View file

@ -151,7 +151,8 @@ pub fn uniq_expr_with(
.collect(); .collect();
// load builtin values // load builtin values
let constraint = constrain_imported_values(imports, constraint, &var_store); let (_introduced_rigids, constraint) =
constrain_imported_values(imports, constraint, &var_store);
// load builtin types // load builtin types
let mut constraint = load_builtin_aliases(&stdlib.aliases, constraint, &var_store); let mut constraint = load_builtin_aliases(&stdlib.aliases, constraint, &var_store);
@ -231,7 +232,8 @@ pub fn can_expr_with(arena: &Bump, home: ModuleId, expr_str: &str) -> CanExprOut
.collect(); .collect();
//load builtin values //load builtin values
let constraint = constrain_imported_values(imports, constraint, &var_store); let (_introduced_rigids, constraint) =
constrain_imported_values(imports, constraint, &var_store);
//load builtin types //load builtin types
let mut constraint = let mut constraint =

8
compiler/solve/tests/helpers/mod.rs
View file

@ -151,14 +151,10 @@ pub fn uniq_expr_with(
.collect(); .collect();
// load builtin values // load builtin values
<<<<<<< HEAD
// TODO what to do with those rigids? // TODO what to do with those rigids?
let (_introduced_rigids, constraint) = let (_introduced_rigids, constraint) =
constrain_imported_values(imports, constraint, &var_store); constrain_imported_values(imports, constraint, &var_store);
=======
let constraint = constrain_imported_values(imports, constraint, &var_store);
>>>>>>> Move solve and uniq tests into other crates
// load builtin types // load builtin types
let mut constraint = load_builtin_aliases(&stdlib.aliases, constraint, &var_store); let mut constraint = load_builtin_aliases(&stdlib.aliases, constraint, &var_store);
@ -238,12 +234,8 @@ pub fn can_expr_with(arena: &Bump, home: ModuleId, expr_str: &str) -> CanExprOut
.collect(); .collect();
//load builtin values //load builtin values
<<<<<<< HEAD
let (_introduced_rigids, constraint) = let (_introduced_rigids, constraint) =
constrain_imported_values(imports, constraint, &var_store); constrain_imported_values(imports, constraint, &var_store);
=======
let constraint = constrain_imported_values(imports, constraint, &var_store);
>>>>>>> Move solve and uniq tests into other crates
//load builtin types //load builtin types
let mut constraint = let mut constraint =

8
compiler/uniq/tests/helpers/mod.rs
View file

@ -151,14 +151,10 @@ pub fn uniq_expr_with(
.collect(); .collect();
// load builtin values // load builtin values
<<<<<<< HEAD
// TODO what to do with those rigids? // TODO what to do with those rigids?
let (_introduced_rigids, constraint) = let (_introduced_rigids, constraint) =
constrain_imported_values(imports, constraint, &var_store); constrain_imported_values(imports, constraint, &var_store);
=======
let constraint = constrain_imported_values(imports, constraint, &var_store);
>>>>>>> Move solve and uniq tests into other crates
// load builtin types // load builtin types
let mut constraint = load_builtin_aliases(&stdlib.aliases, constraint, &var_store); let mut constraint = load_builtin_aliases(&stdlib.aliases, constraint, &var_store);
@ -238,12 +234,8 @@ pub fn can_expr_with(arena: &Bump, home: ModuleId, expr_str: &str) -> CanExprOut
.collect(); .collect();
//load builtin values //load builtin values
<<<<<<< HEAD
let (_introduced_rigids, constraint) = let (_introduced_rigids, constraint) =
constrain_imported_values(imports, constraint, &var_store); constrain_imported_values(imports, constraint, &var_store);
=======
let constraint = constrain_imported_values(imports, constraint, &var_store);
>>>>>>> Move solve and uniq tests into other crates
//load builtin types //load builtin types
let mut constraint = let mut constraint =