Fix can not build with indexing-zh (#1433)

* fix can not build zola with search/indexing-zh feature

* fix can not build components/utils after enabled indexing-zh feature

error[E0252]: the name `Deserialize` is defined multiple times
 --> components/utils/src/de.rs:2:5
  |
1 | use serde::{Deserialize, Deserializer};
  |             ----------- previous import of the macro `Deserialize` here
2 | use serde_derive::Deserialize;
  |     ^^^^^^^^^^^^^^^^^^^^^^^^^ `Deserialize` reimported here
  |
  = note: `Deserialize` must be defined only once in the macro namespace of this module
This commit is contained in:
Songmin Li 2021-04-19 16:33:12 +08:00 committed by GitHub
parent 421a2512f7
commit 4f7b960985
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 7 deletions

2
Cargo.lock generated
View file

@ -3016,7 +3016,6 @@ dependencies = [
"minify-html", "minify-html",
"percent-encoding", "percent-encoding",
"serde", "serde",
"serde_derive",
"slug", "slug",
"tempfile", "tempfile",
"tera", "tera",
@ -3325,6 +3324,7 @@ dependencies = [
"percent-encoding", "percent-encoding",
"relative-path", "relative-path",
"same-file", "same-file",
"search",
"serde_json", "serde_json",
"site", "site",
"termcolor", "termcolor",

View file

@ -44,6 +44,7 @@ site = { path = "components/site" }
errors = { path = "components/errors" } errors = { path = "components/errors" }
front_matter = { path = "components/front_matter" } front_matter = { path = "components/front_matter" }
utils = { path = "components/utils" } utils = { path = "components/utils" }
search = { path = "components/search" }
[dev-dependencies] [dev-dependencies]
same-file = "1" same-file = "1"

View file

@ -10,8 +10,7 @@ tera = "1"
unicode-segmentation = "1.2" unicode-segmentation = "1.2"
walkdir = "2" walkdir = "2"
toml = "0.5" toml = "0.5"
serde = "1" serde = { version = "1.0", features = ["derive"] }
serde_derive = "1"
slug = "0.1" slug = "0.1"
percent-encoding = "2" percent-encoding = "2"
filetime = "0.2.12" filetime = "0.2.12"

View file

@ -1,5 +1,4 @@
use serde::{Deserialize, Deserializer}; use serde::{Deserialize, Deserializer};
use serde_derive::Deserialize;
use tera::{Map, Value}; use tera::{Map, Value};
/// Used as an attribute when we want to convert from TOML to a string date /// Used as an attribute when we want to convert from TOML to a string date

View file

@ -1,4 +1,4 @@
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "lowercase")] #[serde(rename_all = "lowercase")]

View file

@ -21,7 +21,7 @@ If you want to use per-language taxonomies, ensure you set the `lang` field in t
configuration. configuration.
Note: By default, Chinese and Japanese search indexing is not included. You can include Note: By default, Chinese and Japanese search indexing is not included. You can include
the support by building `zola` using `cargo build --features search/indexing-ja search/indexing-zh`. the support by building `zola` using `cargo build --features search/indexing-ja --features search/indexing-zh`.
Please also note that, enabling Chinese indexing will increase the binary size by approximately Please also note that, enabling Chinese indexing will increase the binary size by approximately
5 MB while enabling Japanese indexing will increase the binary size by approximately 70 MB 5 MB while enabling Japanese indexing will increase the binary size by approximately 70 MB
due to the incredibly large dictionaries. due to the incredibly large dictionaries.