A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Make serde an optional dependency in wasmtime-core (#12739)
bjorn372dccdfd80e9
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.tomlindex a8c0defef6..b8573e2b3a 100644--- a/crates/core/Cargo.toml+++ b/crates/core/Cargo.toml@@ -13,7 +13,7 @@ version.workspace = trueanyhow = { workspace = true, optional = true }hashbrown = { workspace = true, features = ["default-hasher"] }libm = { workspace = true }-serde = { workspace = true }+serde = { workspace = true, optional = true }[lints]workspace = true@@ -26,3 +26,4 @@ backtrace = ["std"]# Enable the `From<Error> for anyhow::Error` implementation and# `Error::from_anyhow` constructor.anyhow = ["dep:anyhow"]+serde = ["dep:serde"]diff --git a/crates/core/src/alloc/string.rs b/crates/core/src/alloc/string.rsindex 018063f239..097f1d5ca1 100644--- a/crates/core/src/alloc/string.rs+++ b/crates/core/src/alloc/string.rs@@ -67,6 +67,7 @@ impl From<inner::String> for TryString {}}+#[cfg(feature = "serde")]impl serde::ser::Serialize for TryString {fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>where@@ -76,6 +77,7 @@ impl serde::ser::Serialize for TryString {}}+#[cfg(feature = "serde")]impl<'de> serde::de::Deserialize<'de> for TryString {fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>wherediff --git a/crates/core/src/alloc/vec.rs b/crates/core/src/alloc/vec.rsindex 18d895376a..4f433dd69a 100644--- a/crates/core/src/alloc/vec.rs+++ b/crates/core/src/alloc/vec.rs@@ -3,13 +3,12 @@ use crate::error::OutOfMemory;use core::borrow::Borrow;use core::{cmp::Ordering,- fmt,- marker::PhantomData,- mem,+ fmt, mem,num::NonZeroUsize,ops::{Deref, DerefMut, Index, IndexMut},slice::SliceIndex,};+#[cfg(feature = "serde")]use serde::ser::SerializeSeq;use std_alloc::alloc::Layout;use std_alloc::boxed::Box;@@ -389,6 +388,7 @@ impl<T> From<Box<[T]>> for TryVec<T> {}}+#[cfg(feature = "serde")]impl<T> serde::ser::Serialize for TryVec<T>whereT: serde::ser::Serialize,@@ -405,6 +405,7 @@ where}}+#[cfg(feature = "serde")]impl<'de, T> serde::de::Deserialize<'de> for TryVec<T>whereT: serde::de::Deserialize<'de>,@@ -413,6 +414,8 @@ wherewhereD: serde::Deserializer<'de>,{+ use core::marker::PhantomData;+struct Visitor<T>(PhantomData<fn() -> TryVec<T>>);impl<'de, T> serde::de::Visitor<'de> for Visitor<T>diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.tomlindex 255d996a8f..d2267ff8bb 100644--- a/crates/environ/Cargo.toml+++ b/crates/environ/Cargo.toml@@ -37,7 +37,7 @@ target-lexicon = { workspace = true }wasm-encoder = { workspace = true, optional = true }wasmprinter = { workspace = true, optional = true }wasmtime-component-util = { workspace = true, optional = true }-wasmtime-core = { workspace = true }+wasmtime-core = { workspace = true, features = ['serde'] }semver = { workspace = true, optional = true, features = ['serde'] }smallvec = { workspace = true, features = ['serde'] }sha2 = { workspace = true }diff --git a/crates/fuzzing/Cargo.toml b/crates/fuzzing/Cargo.tomlindex 044a629e8c..2409856816 100644--- a/crates/fuzzing/Cargo.toml+++ b/crates/fuzzing/Cargo.toml@@ -28,7 +28,7 @@ wasmparser = { workspace = true }wasmprinter = { workspace = true }wasmtime-wast = { workspace = true, features = ['component-model'] }wasmtime = { workspace = true, features = ['default', 'winch'] }-wasmtime-core = { workspace = true, features = ['backtrace'] }+wasmtime-core = { workspace = true, features = ['backtrace', 'serde'] }wasm-encoder = { workspace = true }wasm-smith = { workspace = true, features = ['serde'] }wasm-mutate = { workspace = true }diff --git a/crates/wasmtime/Cargo.toml b/crates/wasmtime/Cargo.tomlindex 0aca1b9b26..3115a0c1de 100644--- a/crates/wasmtime/Cargo.toml+++ b/crates/wasmtime/Cargo.toml@@ -29,7 +29,7 @@ wasmtime-component-macro = { workspace = true, optional = true }wasmtime-component-util = { workspace = true, optional = true }wasmtime-versioned-export-macros = { workspace = true }wasmtime-wmemcheck = { workspace = true, optional = true }-wasmtime-core = { workspace = true }+wasmtime-core = { workspace = true, features = ['serde'] }pulley-interpreter = { workspace = true }target-lexicon = { workspace = true }wasmparser = { workspace = true }