From 618cf71513d32355d05117c4a0c5dfe151d159f9 Mon Sep 17 00:00:00 2001
From: Patrick Thomson <patrickt@github.com>
Date: Wed, 1 Jul 2020 20:52:06 -0400
Subject: [PATCH] Make Rust commensurate with its cabal version.

---
 WORKSPACE                               | 12 ++++++------
 semantic-rust/BUILD.bazel               |  2 +-
 semantic-rust/src/Language/Rust/AST.hs  |  4 ++--
 semantic-rust/src/Language/Rust/Tags.hs |  1 -
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 9606a98ec..bc9bf56b3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -182,12 +182,6 @@ tree_sitter_node_types_release(
     version = "0.16.0",
 )
 
-tree_sitter_node_types_release(
-    name = "tree-sitter-rust",
-    sha256 = "8c34f19a9270ee60367ee235226ff1108341f944e0bd245cb47e1c2721f0c39b",
-    version = "0.16.1",
-)
-
 tree_sitter_node_types_release(
     name = "tree-sitter-go",
     sha256 = "7278f1fd4dc4de8a13b0f60407425d38c5cb3973e1938d3031a68e1e69bd0b75",
@@ -234,6 +228,12 @@ tree_sitter_node_types_git(
     shallow_since = "1591381188 -0400",
 )
 
+tree_sitter_node_types_git(
+    name = "tree-sitter-rust",
+    commit = "ab40806a4583b84b9d5636f5a93c0ebfa45b2675",
+    shallow_since = "1583184357 -0800",
+)
+
 load("//:build/example_repos.bzl", "declare_example_repos")
 
 declare_example_repos()
diff --git a/semantic-rust/BUILD.bazel b/semantic-rust/BUILD.bazel
index 27e180164..91c0f35ee 100644
--- a/semantic-rust/BUILD.bazel
+++ b/semantic-rust/BUILD.bazel
@@ -6,7 +6,7 @@ load(
 )
 
 semantic_language_library(
-    name = "lib",
+    name = "semantic-rust",
     srcs = glob(["src/**/*.hs"]),
     language = "rust",
 )
diff --git a/semantic-rust/src/Language/Rust/AST.hs b/semantic-rust/src/Language/Rust/AST.hs
index 39b538efa..87392fce0 100644
--- a/semantic-rust/src/Language/Rust/AST.hs
+++ b/semantic-rust/src/Language/Rust/AST.hs
@@ -12,7 +12,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators #-}
-
+{-# OPTIONS_GHC -Wno-unused-imports #-}
 
 module Language.Rust.AST
 ( module Language.Rust.AST
@@ -27,5 +27,5 @@ import qualified TreeSitter.Rust as Rust (getNodeTypesPath, getTestCorpusDir, tr
 #ifdef NODE_TYPES_PATH
 astDeclarationsForLanguage Rust.tree_sitter_rust NODE_TYPES_PATH
 #else
-runIO TSX.getNodeTypesPath >>= astDeclarationsForLanguage Rust.tree_sitter_rust
+runIO Rust.getNodeTypesPath >>= astDeclarationsForLanguage Rust.tree_sitter_rust
 #endif
diff --git a/semantic-rust/src/Language/Rust/Tags.hs b/semantic-rust/src/Language/Rust/Tags.hs
index 77e128292..62b0d76bf 100644
--- a/semantic-rust/src/Language/Rust/Tags.hs
+++ b/semantic-rust/src/Language/Rust/Tags.hs
@@ -139,7 +139,6 @@ instance ToTags Rust.MutPattern
 instance ToTags Rust.MutableSpecifier
 instance ToTags Rust.NegativeLiteral
 instance ToTags Rust.OptionalTypeParameter
-instance ToTags Rust.OrPattern
 instance ToTags Rust.OrderedFieldDeclarationList
 instance ToTags Rust.Parameter
 instance ToTags Rust.Parameters