From bdd8c0b68f097c7d1a65a5b85b94f0a79affa506 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Wed, 23 Dec 2020 11:22:36 +0100
Subject: [PATCH] Remove local ungrammar dependency

---
 Cargo.lock                            | 2 ++
 Cargo.toml                            | 2 +-
 crates/parser/src/grammar/patterns.rs | 4 +---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47381c08ee..891cff55e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1828,6 +1828,8 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 [[package]]
 name = "ungrammar"
 version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c11bffada52edc8f2a56160b286ea4640acf90ffcb21bded361ccb8ed43a1457"
 
 [[package]]
 name = "unicase"
diff --git a/Cargo.toml b/Cargo.toml
index fdf2a71a06..59d36fbc1d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,4 +26,4 @@ debug = 0 # Set this to 1 or 2 to get more useful backtraces in debugger.
 # chalk-ir = { path = "../chalk/chalk-ir" }
 # chalk-recursive = { path = "../chalk/chalk-recursive" }
 
-ungrammar = { path = "../ungrammar" }
+# ungrammar = { path = "../ungrammar" }
diff --git a/crates/parser/src/grammar/patterns.rs b/crates/parser/src/grammar/patterns.rs
index 44400c9f8e..b53d5749f4 100644
--- a/crates/parser/src/grammar/patterns.rs
+++ b/crates/parser/src/grammar/patterns.rs
@@ -1,7 +1,5 @@
 //! FIXME: write short doc here
 
-use expressions::block_expr;
-
 use super::*;
 
 pub(super) const PATTERN_FIRST: TokenSet =
@@ -399,6 +397,6 @@ fn const_block_pat(p: &mut Parser) -> CompletedMarker {
     assert!(p.at(T![const]));
     let m = p.start();
     p.bump(T![const]);
-    block_expr(p);
+    expressions::block_expr(p);
     m.complete(p, CONST_BLOCK_PAT)
 }