Eliminate dependency on serde's "derive" feature

sharkdp · Dec 28, 2023 · a42ba41 · a42ba41
1 parent 0acb979
commit a42ba41
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -53,11 +53,12 @@ content_inspector = "0.2.4"
 shell-words = { version = "1.1.0", optional = true }
 unicode-width = "0.1.11"
 globset = "0.4"
-serde = { version = "1.0", features = ["derive"] }
+serde = "1.0"
+serde_derive = "1.0"
 serde_yaml = "0.9.28"
 semver = "1.0"
 path_abs = { version = "0.5", default-features = false }
-clircle = "0.4"
+clircle = "0.5"
 bugreport = { version = "0.5.0", optional = true }
 etcetera = { version = "0.8.0", optional = true }
 grep-cli = { version = "0.1.10", optional = true }
@@ -94,6 +95,7 @@ serial_test = { version = "2.0.0", default-features = false }
 predicates = "3.0.4"
 wait-timeout = "0.2.0"
 tempfile = "3.8.1"
+serde = { version = "1.0", features = ["derive"] }
 
 [target.'cfg(unix)'.dev-dependencies]
 nix = { version = "0.26.4", default-features = false, features = ["term"] }
@@ -110,3 +112,6 @@ features = ["wrap_help", "cargo"]
 lto = true
 strip = true
 codegen-units = 1
+
+[patch.crates-io]
+syntect = { git = "https://github.com/trishume/syntect" }
diff --git a/src/assets/assets_metadata.rs b/src/assets/assets_metadata.rs
@@ -3,7 +3,7 @@ use std::path::Path;
 use std::time::SystemTime;
 
 use semver::Version;
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 
 use crate::error::*;
 

diff --git a/src/assets/lazy_theme_set.rs b/src/assets/lazy_theme_set.rs
@@ -3,8 +3,7 @@ use super::*;
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 
-use serde::Deserialize;
-use serde::Serialize;
+use serde_derive::{Deserialize, Serialize};
 
 use once_cell::unsync::OnceCell;