language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +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

4
crates/compiler/can/src/pattern.rs
View file

@ -322,7 +322,11 @@ pub fn canonicalize_def_header_pattern<'a>(
pub struct PermitShadows(pub bool);
fn canonicalize_pattern_symbol(
<<<<<<< HEAD
env: &mut Env,
=======
env: &mut Env<'_>,
>>>>>>> 28146c939f11c8b65504c9d35c69fdef31b976e8
scope: &mut Scope,
output: &mut Output,
region: Region,