language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 06:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'main' into return-keyword

Browse source
This commit is contained in:
Sam Mohr 2024-10-24 23:01:10 -07:00 • committed by GitHub
commit 294f0c0d1f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
197 changed files with 2124 additions and 1678 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/compiler/constrain/src/expr.rs
View file

@ -22,7 +22,6 @@ use roc_can::expr::{
use roc_can::pattern::Pattern;
use roc_can::traverse::symbols_introduced_from_pattern;
use roc_collections::all::{HumanIndex, MutMap, SendMap};
use roc_collections::soa::{Index, Slice};
use roc_collections::VecMap;
use roc_module::ident::Lowercase;
use roc_module::symbol::{ModuleId, Symbol};
@ -33,6 +32,7 @@ use roc_types::types::{
AliasKind, AnnotationSource, Category, IndexOrField, OptAbleType, PReason, Reason, RecordField,
TypeExtension, TypeTag, Types,
};
use soa::{Index, Slice};
/// This is for constraining Defs
#[derive(Default, Debug)]
@ -3018,7 +3018,7 @@ fn constrain_typed_function_arguments(
None
};
let it = arguments.iter().zip(arg_types.into_iter()).enumerate();
let it = arguments.iter().zip(arg_types).enumerate();
for (index, ((pattern_var, annotated_mark, loc_pattern), ann)) in it {
let pattern_var_index = constraints.push_variable(*pattern_var);
let ann_index = constraints.push_type(types, ann);
@ -3172,7 +3172,7 @@ fn constrain_typed_function_arguments_simple(
arguments: &[(Variable, AnnotatedMark, Loc<Pattern>)],
arg_types: Slice<TypeTag>,
) {
let it = arguments.iter().zip(arg_types.into_iter()).enumerate();
let it = arguments.iter().zip(arg_types).enumerate();
for (index, ((pattern_var, annotated_mark, loc_pattern), ann)) in it {
let pattern_var_index = constraints.push_variable(*pattern_var);
let ann_index = constraints.push_type(types, ann);