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

Merge remote-tracking branch 'origin/trunk' into specialize-separately

Browse source
This commit is contained in:
Richard Feldman 2020-06-13 23:54:30 -04:00
commit 1b3b9ee1c4
22 changed files with 499 additions and 465 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/can/src/expr.rs
View file

@ -170,7 +170,7 @@ pub struct WhenBranch {
pub fn canonicalize_expr<'a>(
env: &mut Env<'a>,
var_store: &VarStore,
var_store: &mut VarStore,
scope: &mut Scope,
region: Region,
expr: &'a ast::Expr<'a>,
@ -692,7 +692,7 @@ pub fn canonicalize_expr<'a>(
#[inline(always)]
fn canonicalize_when_branch<'a>(
env: &mut Env<'a>,
var_store: &VarStore,
var_store: &mut VarStore,
scope: &mut Scope,
_region: Region,
branch: &'a ast::WhenBranch<'a>,
@ -887,7 +887,7 @@ where
fn canonicalize_fields<'a>(
env: &mut Env<'a>,
var_store: &VarStore,
var_store: &mut VarStore,
scope: &mut Scope,
region: Region,
fields: &'a [Located<ast::AssignedField<'a, ast::Expr<'a>>>],
@ -924,7 +924,7 @@ fn canonicalize_fields<'a>(
fn canonicalize_field<'a>(
env: &mut Env<'a>,
var_store: &VarStore,
var_store: &mut VarStore,
scope: &mut Scope,
field: &'a ast::AssignedField<'a, ast::Expr<'a>>,
region: Region,