Fix formatting by updating to lalrpop 0.19

Author: Marwes

Cargo.lock

@@ -147,4 +147,4 @@ features = ["docs_rs"]
 # debug = 2
 #
 # [profile.release]
-# debug = 2
+# debug = 2

Cargo.toml

@@ -16,11 +16,13 @@ fn new_vm() -> RootedThread {
 
 fn format_expr(expr: &str) -> gluon::Result<String> {
     let thread = new_vm();
+    thread.get_database_mut().set_implicit_prelude(false);
     thread.format_expr(&mut format::Formatter::default(), "test", expr)
 }
 
 fn format_expr_expanded(expr: &str) -> gluon::Result<String> {
     let thread = new_vm();
+    thread.get_database_mut().set_implicit_prelude(false);
     thread.format_expr(&mut format::Formatter { expanded: true }, "test", expr)
 }
 
@@ -389,6 +391,17 @@ abc ""
     assert_diff!(&format_expr(expr).unwrap(), expr, "\n", 0);
 }
 
+#[test]
+fn comments_between_lambda_and_let() {
+    let expr = r#"
+\x ->
+    // abc
+    let y = x
+    y
+"#;
+    assert_diff!(&format_expr(expr).unwrap(), expr, "\n", 0);
+}
+
 #[test]
 #[ignore] // TODO
 fn function_type_with_comments() {

format/tests/pretty_print.rs

@@ -21,7 +21,7 @@ travis-ci = { repository = "gluon-lang/gluon" }
 collect-mac = "0.1.0"
 itertools = "0.8"
 quick-error = "1.0.0"
-lalrpop-util = "0.18"
+lalrpop-util = "0.19"
 log = "0.4"
 pretty = "0.9"
 gluon_base = { path = "../base", version = "0.14.1" } # GLUON
@@ -36,7 +36,7 @@ difference = "2"
 pretty_assertions = "0.6"
 
 [build-dependencies]
-lalrpop = "0.18"
+lalrpop = "0.19"
 
 [[bench]]
 name = "parser"

parser/Cargo.toml

@@ -72,21 +72,23 @@ type LalrpopError<'input> =
     lalrpop_util::ParseError<BytePos, BorrowedToken<'input>, Spanned<Error, BytePos>>;
 
 /// Shrink hidden spans to fit the visible expressions and flatten singleton blocks.
-fn shrink_hidden_spans<Id>(mut expr: SpannedExpr<Id>) -> SpannedExpr<Id> {
+fn shrink_hidden_spans<Id: std::fmt::Debug>(mut expr: SpannedExpr<Id>) -> SpannedExpr<Id> {
     match expr.value {
         Expr::Infix { rhs: ref last, .. }
         | Expr::IfElse(_, _, ref last)
-        | Expr::LetBindings(_, ref last)
         | Expr::TypeBindings(_, ref last)
         | Expr::Do(Do { body: ref last, .. }) => {
             expr.span = Span::new(expr.span.start(), last.span.end())
         }
+        Expr::LetBindings(_, ref last) => expr.span = Span::new(expr.span.start(), last.span.end()),
         Expr::Lambda(ref lambda) => {
             expr.span = Span::new(expr.span.start(), lambda.body.span.end())
         }
         Expr::Block(ref mut exprs) => match exprs {
             [] => (),
-            [e] => return std::mem::take(e),
+            [e] => {
+                return std::mem::take(e);
+            }
             _ => expr.span = Span::new(expr.span.start(), exprs.last().unwrap().span.end()),
         },
         Expr::Match(_, ref alts) => {

parser/src/lib.rs

@@ -28,7 +28,7 @@ crossbeam-utils = "0.6"
 frunk_core = "0.3"
 futures = { version = "0.3.1", features = ["compat", "async-await"] }
 itertools = "0.8"
-lalrpop-util = { version = "0.18", optional = true }
+lalrpop-util = { version = "0.19", optional = true }
 log = "0.4"
 ordered-float = "1"
 parking_lot = "0.9"
@@ -52,7 +52,7 @@ gluon_codegen = { path = "../codegen", version = "0.14.1" } # GLUON
 gluon_parser = { path = "../parser", version = "0.14.1", optional = true } # GLUON
 
 [build-dependencies]
-lalrpop = { version = "0.18", features = ["lexer"], optional = true }
+lalrpop = { version = "0.19", features = ["lexer"], optional = true }
 
 [dev-dependencies]
 difference = "2"
@@ -63,7 +63,7 @@ pretty_assertions = "0.6"
 # (which requires gluon_vm to be published)
 gluon = { path = "..", version = ">=0.9" }
 
-lalrpop-util = "0.18"
+lalrpop-util = "0.19"
 regex = "1"
 serde_json = "1.0.0"