Skip to content

Commit a2054dc

Browse files
authored
Merge pull request #129 from cuviper/serde-no_std
Build serde without default features
2 parents 8c9df6b + e0c627b commit a2054dc

File tree

5 files changed

+21
-5
lines changed

5 files changed

+21
-5
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ script:
4646
if [ -z "$SKIP_TEST" ]; then
4747
cargo test --verbose --features "$FEATURES" &&
4848
cargo test --release --verbose --features "$FEATURES"
49+
if [ "$FEATURES" = "serde-1" ]; then
50+
cargo test --verbose -p test-serde &&
51+
cargo test --release --verbose -p test-serde
52+
fi
4953
fi &&
5054
if [ -n "$TEST_BENCH" ]; then
5155
cargo test -v --benches --no-run --features "$FEATURES"

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ bench = false
3232
[build-dependencies]
3333
autocfg = "1"
3434
[dependencies]
35-
serde = { version = "1.0", optional = true }
35+
serde = { version = "1.0", optional = true, default-features = false }
3636
rayon = { version = "1.0", optional = true }
3737

3838
[dev-dependencies]
@@ -41,7 +41,6 @@ rand = {version = "0.7", features = ["small_rng"] }
4141
quickcheck = { version = "0.9", default-features = false }
4242
fnv = "1.0"
4343
lazy_static = "1.3"
44-
serde_test = "1.0.99"
4544

4645
[features]
4746
# Serialization with serde 1.0
@@ -62,4 +61,4 @@ tag-name = "{{version}}"
6261
features = ["serde-1", "rayon"]
6362

6463
[workspace]
65-
members = ["test-nostd"]
64+
members = ["test-nostd", "test-serde"]

test-nostd/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ publish = false
66
edition = "2018"
77

88
[dependencies]
9-
indexmap = { path = ".." }
9+
indexmap = { path = "..", features = ["serde-1"] }
1010
# no-std compatible hasher
1111
twox-hash = { version = "1.5", default-features = false }
1212

test-serde/Cargo.toml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[package]
2+
name = "test-serde"
3+
version = "0.1.0"
4+
authors = ["bluss"]
5+
publish = false
6+
edition = "2018"
7+
8+
[dependencies]
9+
10+
[dev-dependencies]
11+
fnv = "1.0"
12+
indexmap = { path = "..", features = ["serde-1"] }
13+
serde_test = "1.0.99"

tests/serde.rs renamed to test-serde/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![cfg(feature = "serde-1")]
1+
#![cfg(test)]
22

33
#[macro_use]
44
extern crate indexmap;

0 commit comments

Comments
 (0)