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

fix some merge conflict consequences

Browse source
This commit is contained in:
Sébastien Besnier 2020-11-13 19:28:55 +01:00
parent 58acc59b01
commit b29792855f
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/parse/src/parser.rs
View file

@ -611,7 +611,7 @@ where
D: Parser<'a, ()>,
P: Parser<'a, Val>,
{
move |arena, state: State<'a>| {
move |arena, state: State<'a>| {
match parser.parse(arena, state) {
Ok((first_output, next_state)) => {
let mut state = next_state;
@ -894,7 +894,8 @@ macro_rules! collection_trailing_sep {
$crate::parser::trailing_sep_by0(
$delimiter,
$crate::blankspace::space0_around($elem, $min_indent)
), $crate::blankspace::spaces0($min_indent)
),
$crate::blankspace::spaces0($min_indent)
),
$closing_brace
)
@ -1209,7 +1210,8 @@ macro_rules! record {
loc!(record_field!($val_parser, $min_indent)),
$min_indent
),
), $crate::blankspace::space0($min_indent)
),
$crate::blankspace::space0($min_indent)
),
$crate::parser::ascii_char(b'}')
)