Move crimp crate back into wasmtime

Author: arjunr2

Cargo.lock

@@ -283,7 +283,6 @@ wiggle-generate = { path = "crates/wiggle/generate", version = "=40.0.0" }
 wasi-common = { path = "crates/wasi-common", version = "=40.0.0", default-features = false }
 pulley-interpreter = { path = 'pulley', version = "=40.0.0" }
 pulley-macros = { path = 'pulley/macros', version = "=40.0.0" }
-wasm-crimp = { path = "crates/wasm-crimp", version = "=40.0.0" }
 
 # Cranelift crates in this workspace
 cranelift-assembler-x64 = { path = "cranelift/assembler-x64", version = "0.127.0" }

Cargo.toml

@@ -31,7 +31,6 @@ wasmtime-slab = { workspace = true, optional = true }
 wasmtime-versioned-export-macros = { workspace = true }
 wasmtime-wmemcheck = { workspace = true, optional = true }
 wasmtime-math = { workspace = true }
-wasm-crimp = { workspace = true, optional = true }
 pulley-interpreter = { workspace = true }
 target-lexicon = { workspace = true }
 wasmparser = { workspace = true }
@@ -347,7 +346,6 @@ std = [
   "dep:rustix",
   "wasmtime-jit-icache-coherence",
   "wasmtime-jit-debug?/std",
-  "wasm-crimp?/std"
 ]
 
 # Enables support for the `Store::call_hook` API which enables injecting custom
@@ -429,7 +427,4 @@ debug = [
 compile-time-builtins = ['dep:wasm-compose', 'dep:tempfile']
 
 # Enable support for the common base infrastructure of record/replay
-rr = [
-  "dep:wasm-crimp",
-  "component-model"
-]
+rr = ["component-model"]

crates/wasm-crimp/Cargo.toml

@@ -5,11 +5,10 @@ use crate::store::InstanceId;
 use crate::{AsContextMut, ModuleVersionStrategy, Val, ValRaw, ValType};
 use wasmtime_environ::component::FlatTypesStorage;
 
-// Public Re-exports
-pub use wasm_crimp::{RecordSettings, RecordWriter, ReplayError, ReplayReader, ReplaySettings};
-// Crate-internal re-exports
-pub(crate) use wasm_crimp::{
-    RREvent, RRFuncArgVals, Recorder, Replayer, ResultEvent, Validate, common_events,
+mod crimp;
+pub use crimp::{
+    RREvent, RRFuncArgVals, RecordSettings, RecordWriter, Recorder, ReplayError, ReplayReader,
+    ReplaySettings, Replayer, ResultEvent, Validate, common_events,
     component_events::{self, RRComponentInstanceId},
     core_events::{self, RRModuleInstanceId},
     from_replay_reader, to_record_writer,
@@ -298,10 +297,10 @@ mod tests {
     use crate::ValRaw;
     use crate::WasmFuncOrigin;
     use crate::store::InstanceId;
+    use crimp::EventError;
     use std::fs::File;
     use std::path::Path;
     use tempfile::{NamedTempFile, TempPath};
-    use wasm_crimp::EventError;
     use wasmtime_environ::{FuncIndex, component::ResourceDropRet};
 
     impl ReplayBuffer {

crates/wasmtime/Cargo.toml

@@ -1,24 +1,15 @@
-#![no_std]
-
-pub(crate) mod prelude {
-    pub use anyhow::{self, Result};
-    pub use serde::{Deserialize, Serialize};
-    pub use wasmtime_environ::prelude::*;
-}
+//! The CRIMP record-replay interface specification.
 
 use crate::prelude::*;
-pub use core::fmt;
+use core::fmt;
 pub use events::{
     EventError, RRFuncArgVals, ResultEvent, Validate, common_events,
     component_events::{self, RRComponentInstanceId},
     core_events::{self, RRModuleInstanceId},
 };
 pub use io::{RecordWriter, ReplayReader, from_replay_reader, to_record_writer};
-// Export necessary environ types for interactions with the crate
-pub use wasmtime_environ::{
-    EntityIndex, FuncIndex, WasmChecksum,
-    component::{ExportIndex, InterfaceType, ResourceDropRet},
-};
+use serde::{Deserialize, Serialize};
+use wasmtime_environ::{EntityIndex, WasmChecksum};
 
 /// Encapsulation of event types comprising an [`RREvent`] sum type
 mod events;

crates/wasmtime/src/runtime/rr/backend.rs

@@ -1,5 +1,7 @@
-use crate::{ReplayError, prelude::*};
+use super::ReplayError;
+use crate::prelude::*;
 use core::fmt;
+use serde::{Deserialize, Serialize};
 
 /// A serde compatible representation of errors produced during execution
 /// of certain events

crates/wasm-crimp/src/lib.rs …wasmtime/src/runtime/rr/backend/crimp.rscrates/wasm-crimp/src/lib.rs renamed to crates/wasmtime/src/runtime/rr/backend/crimp.rs crates/wasm-crimp/src/lib.rs renamed to crates/wasmtime/src/runtime/rr/backend/crimp.rs

@@ -5,7 +5,6 @@
 
 use super::*;
 use crate::RecordSettings;
-use serde::{Deserialize, Serialize};
 
 /// A call event from Wasm (core or component) into the host
 ///

crates/wasm-crimp/src/events.rs …e/src/runtime/rr/backend/crimp/events.rscrates/wasm-crimp/src/events.rs renamed to crates/wasmtime/src/runtime/rr/backend/crimp/events.rs crates/wasm-crimp/src/events.rs renamed to crates/wasmtime/src/runtime/rr/backend/crimp/events.rs

@@ -1,7 +1,8 @@
 //! Module comprising of component model wasm events
 
 use super::*;
-use crate::{ExportIndex, InterfaceType, ResourceDropRet, WasmChecksum};
+use wasmtime_environ::WasmChecksum;
+use wasmtime_environ::component::{ExportIndex, InterfaceType, ResourceDropRet};
 
 /// Representation of a component instance identifier during record/replay.
 ///

…s/wasm-crimp/src/events/common_events.rs …rr/backend/crimp/events/common_events.rscrates/wasm-crimp/src/events/common_events.rs renamed to crates/wasmtime/src/runtime/rr/backend/crimp/events/common_events.rs crates/wasm-crimp/src/events/common_events.rs renamed to crates/wasmtime/src/runtime/rr/backend/crimp/events/common_events.rs

@@ -1,6 +1,6 @@
 //! Module comprising of core wasm events
 use super::*;
-use crate::{EntityIndex, FuncIndex, WasmChecksum};
+use wasmtime_environ::{EntityIndex, FuncIndex, WasmChecksum};
 
 /// Representation of a Wasm module instance identifier during record/replay.
 ///