Add necessary wasmtime environ types as re-exports through rr

Author: arjunr2

crates/rr/src/events.rs

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

crates/rr/src/events/component_events.rs

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

crates/rr/src/events/core_events.rs

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

crates/rr/src/lib.rs

@@ -13,7 +13,11 @@ pub use events::{
 };
 use events::{component_events::RRComponentInstanceId, core_events::RRModuleInstanceId};
 pub use io::{RecordWriter, ReplayReader, from_replay_reader, to_record_writer};
-use wasmtime_environ::{EntityIndex, WasmChecksum};
+// Export necessary environ types for interactions with the crate
+pub use wasmtime_environ::{
+    EntityIndex, FuncIndex, WasmChecksum,
+    component::{ExportIndex, InterfaceType, ResourceDropRet},
+};
 
 /// Encapsulation of event types comprising an [`RREvent`] sum type
 mod events;