language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 23:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'main' of github.com:roc-lang/roc into rust_version_upgrade

Browse source
This commit is contained in:
Anton-4 2023-04-22 17:14:01 +02:00
commit 937722c462
No known key found for this signature in database
GPG key ID: 0971D718C0A9B937
36 changed files with 217 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/compiler/can/src/annotation.rs
View file

@ -1142,7 +1142,11 @@ fn can_extension_type(
introduced_variables: &mut IntroducedVariables,
local_aliases: &mut VecMap<Symbol, Alias>,
references: &mut VecSet<Symbol>,
<<<<<<< HEAD
opt_ext: &Option<&Loc<TypeAnnotation>>,
=======
opt_ext: &Option<&Loc<TypeAnnotation<'_>>>,
>>>>>>> 28146c939f11c8b65504c9d35c69fdef31b976e8
ext_problem_kind: roc_problem::can::ExtensionTypeKind,
) -> (Type, ExtImplicitOpenness) {
fn valid_record_ext_type(typ: &Type) -> bool {
@ -1454,7 +1458,11 @@ fn can_assigned_fields<'a>(
fn can_assigned_tuple_elems(
env: &mut Env,
pol: CanPolarity,
<<<<<<< HEAD
elems: &&[Loc<TypeAnnotation>],
=======
elems: &&[Loc<TypeAnnotation<'_>>],
>>>>>>> 28146c939f11c8b65504c9d35c69fdef31b976e8
scope: &mut Scope,
var_store: &mut VarStore,
introduced_variables: &mut IntroducedVariables,