From 8a5620ce1526b120751273935821a472d5a10e05 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Mon, 4 Oct 2021 03:58:22 -0500 Subject: [PATCH] Use serde's derive feature --- Cargo.lock | 12 +++++++----- cli/loader/Cargo.toml | 3 +-- cli/loader/src/lib.rs | 3 +-- cli/src/highlight.rs | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 61262a3a..52d02cc4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -518,15 +518,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.123" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_derive" -version = "1.0.123" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", @@ -749,7 +752,6 @@ dependencies = [ "once_cell", "regex", "serde", - "serde_derive", "serde_json", "tree-sitter", "tree-sitter-highlight", diff --git a/cli/loader/Cargo.toml b/cli/loader/Cargo.toml index da27cae4..876b1930 100644 --- a/cli/loader/Cargo.toml +++ b/cli/loader/Cargo.toml @@ -17,8 +17,7 @@ dirs = "3.0" libloading = "0.7" once_cell = "1.7" regex = "1" -serde = "1.0" -serde_derive = "1.0" +serde = { version = "1.0.130", features = ["derive"] } [dependencies.serde_json] version = "1.0" diff --git a/cli/loader/src/lib.rs b/cli/loader/src/lib.rs index 0002bf08..6f8605f4 100644 --- a/cli/loader/src/lib.rs +++ b/cli/loader/src/lib.rs @@ -2,8 +2,7 @@ use anyhow::{anyhow, Context, Error, Result}; use libloading::{Library, Symbol}; use once_cell::unsync::OnceCell; use regex::{Regex, RegexBuilder}; -use serde::{Deserialize, Deserializer}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Deserializer, Serialize}; use std::collections::HashMap; use std::io::BufReader; use std::ops::Range; diff --git a/cli/src/highlight.rs b/cli/src/highlight.rs index 06680d3e..e4849d52 100644 --- a/cli/src/highlight.rs +++ b/cli/src/highlight.rs @@ -4,7 +4,6 @@ use anyhow::Result; use lazy_static::lazy_static; use serde::ser::SerializeMap; use serde::{Deserialize, Deserializer, Serialize, Serializer}; -use serde_derive::{Deserialize, Serialize}; use serde_json::{json, Value}; use std::collections::HashMap; use std::fmt::Write;