Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ indexmap = { version = "2.2.3", optional = true }
itoa = "1.0"
memchr = { version = "2", default-features = false }
ryu = "1.0"
serde = { version = "1.0.194", default-features = false }
serde_core = { version = "1.0.220", default-features = false }
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried this as well but it does not work because it collides with the dev-dependency during test builds.

serde = { package = "serde_core", version = "1.0.220", default-features = false }
error[E0464]: multiple candidates for `rlib` dependency `serde` found
  --> src/de.rs:16:5
   |
16 | use serde::de::{self, Expected, Unexpected};
   |     ^^^^^
   |
   = note: candidate #1: /git/serde-json/target/debug/deps/libserde-7f9d001a7d3b68aa.rlib
   = note: candidate #2: /git/serde-json/target/debug/deps/libserde_core-33dd47b23065293c.rlib


[dev-dependencies]
automod = "1.0.11"
Expand Down Expand Up @@ -48,12 +48,12 @@ features = ["float_roundtrip", "raw_value", "unbounded_depth"]
[features]
default = ["std"]

std = ["memchr/std", "serde/std"]
std = ["memchr/std", "serde_core/std"]

# Provide integration for heap-allocated collections without depending on the
# rest of the Rust standard library.
# NOTE: Disabling both `std` *and* `alloc` features is not supported yet.
alloc = ["serde/alloc"]
alloc = ["serde_core/alloc"]

# Make serde_json::Map use a representation which maintains insertion order.
# This allows data to be read into a Value and written back to a JSON string
Expand Down
2 changes: 2 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,8 @@ extern crate alloc;
#[cfg(feature = "std")]
extern crate std;

extern crate serde_core as serde;

// Not public API. Used from macro-generated code.
#[doc(hidden)]
pub mod __private {
Expand Down
Loading