Skip to content

Commit a42ba41

Browse files
committed
Eliminate dependency on serde's "derive" feature
1 parent 0acb979 commit a42ba41

File tree

4 files changed

+23
-20
lines changed

4 files changed

+23
-20
lines changed

Cargo.lock

Lines changed: 14 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@ content_inspector = "0.2.4"
5353
shell-words = { version = "1.1.0", optional = true }
5454
unicode-width = "0.1.11"
5555
globset = "0.4"
56-
serde = { version = "1.0", features = ["derive"] }
56+
serde = "1.0"
57+
serde_derive = "1.0"
5758
serde_yaml = "0.9.28"
5859
semver = "1.0"
5960
path_abs = { version = "0.5", default-features = false }
60-
clircle = "0.4"
61+
clircle = "0.5"
6162
bugreport = { version = "0.5.0", optional = true }
6263
etcetera = { version = "0.8.0", optional = true }
6364
grep-cli = { version = "0.1.10", optional = true }
@@ -94,6 +95,7 @@ serial_test = { version = "2.0.0", default-features = false }
9495
predicates = "3.0.4"
9596
wait-timeout = "0.2.0"
9697
tempfile = "3.8.1"
98+
serde = { version = "1.0", features = ["derive"] }
9799

98100
[target.'cfg(unix)'.dev-dependencies]
99101
nix = { version = "0.26.4", default-features = false, features = ["term"] }
@@ -110,3 +112,6 @@ features = ["wrap_help", "cargo"]
110112
lto = true
111113
strip = true
112114
codegen-units = 1
115+
116+
[patch.crates-io]
117+
syntect = { git = "https://github.com/trishume/syntect" }

src/assets/assets_metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::path::Path;
33
use std::time::SystemTime;
44

55
use semver::Version;
6-
use serde::{Deserialize, Serialize};
6+
use serde_derive::{Deserialize, Serialize};
77

88
use crate::error::*;
99

src/assets/lazy_theme_set.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ use super::*;
33
use std::collections::BTreeMap;
44
use std::convert::TryFrom;
55

6-
use serde::Deserialize;
7-
use serde::Serialize;
6+
use serde_derive::{Deserialize, Serialize};
87

98
use once_cell::unsync::OnceCell;
109

0 commit comments

Comments
 (0)