From 86b408412ca1df77fa2251a96f6c05031d9dbb5d Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Sun, 21 Nov 2021 13:39:30 -0800
Subject: [PATCH] Use serde's derive feature everywhere

---
 Cargo.lock                        | 1 -
 cli/Cargo.toml                    | 3 +--
 cli/config/Cargo.toml             | 2 +-
 cli/src/generate/node_types.rs    | 2 +-
 cli/src/generate/parse_grammar.rs | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f896cf80..9324ace5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -744,7 +744,6 @@ dependencies = [
  "regex-syntax",
  "rustc-hash",
  "serde",
- "serde_derive",
  "serde_json",
  "smallbitvec",
  "tempfile",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 8dde1094..d9f5fd0b 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -32,8 +32,7 @@ lazy_static = "1.2.0"
 regex = "1"
 regex-syntax = "0.6.4"
 rustc-hash = "1"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0.130", features = ["derive"] }
 smallbitvec = "2.5.1"
 tiny_http = "0.8"
 walkdir = "2.3"
diff --git a/cli/config/Cargo.toml b/cli/config/Cargo.toml
index 3e200719..7a498404 100644
--- a/cli/config/Cargo.toml
+++ b/cli/config/Cargo.toml
@@ -13,7 +13,7 @@ repository = "https://github.com/tree-sitter/tree-sitter"
 [dependencies]
 anyhow = "1.0"
 dirs = "3.0"
-serde = "1.0"
+serde = { version = "1.0.130", features = ["derive"] }
 
 [dependencies.serde_json]
 version = "1.0"
diff --git a/cli/src/generate/node_types.rs b/cli/src/generate/node_types.rs
index f675fc13..377cc855 100644
--- a/cli/src/generate/node_types.rs
+++ b/cli/src/generate/node_types.rs
@@ -1,7 +1,7 @@
 use super::grammars::{LexicalGrammar, SyntaxGrammar, VariableType};
 use super::rules::{Alias, AliasMap, Symbol, SymbolType};
 use anyhow::{anyhow, Result};
-use serde_derive::Serialize;
+use serde::Serialize;
 use std::cmp::Ordering;
 use std::collections::{BTreeMap, HashMap, HashSet};
 
diff --git a/cli/src/generate/parse_grammar.rs b/cli/src/generate/parse_grammar.rs
index c91ebd64..7fda0b71 100644
--- a/cli/src/generate/parse_grammar.rs
+++ b/cli/src/generate/parse_grammar.rs
@@ -1,7 +1,7 @@
 use super::grammars::{InputGrammar, PrecedenceEntry, Variable, VariableType};
 use super::rules::{Precedence, Rule};
 use anyhow::{anyhow, Result};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use serde_json::{Map, Value};
 
 #[derive(Deserialize)]