diff --git a/Cargo.toml b/Cargo.toml index d93bc3f..2f7615e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,12 +23,12 @@ repository = "https://github.com/rust-lang/measureme" analyzeme = { path = "analyzeme" } clap = { version = "4.5.0", features = ["derive"] } decodeme = { path = "decodeme" } -decodeme_10_1_2 = { package = "decodeme", git = "https://github.com/rust-lang/measureme", tag = "10.1.2" } +decodeme_10 = { version = "10.1.3", package = "decodeme" } flate2 = "1.0" inferno = { version = "0.11", default-features = false } log = "0.4" measureme = { path = "measureme" } -measureme_10_1_2 = { package = "measureme", git = "https://github.com/rust-lang/measureme", tag = "10.1.2" } +measureme_10 = { version = "10.1.3", package = "measureme" } memchr = "2" memmap2 = "0.2.1" parking_lot = "0.12.0" diff --git a/analyzeme/Cargo.toml b/analyzeme/Cargo.toml index 9e9a135..bd86d18 100644 --- a/analyzeme/Cargo.toml +++ b/analyzeme/Cargo.toml @@ -18,8 +18,8 @@ serde.workspace = true # file formats. # File format: v8 -decodeme_10_1_2.workspace = true -measureme_10_1_2.workspace = true +decodeme_10.workspace = true +measureme_10.workspace = true [dev-dependencies] flate2.workspace = true diff --git a/analyzeme/src/file_formats/v8.rs b/analyzeme/src/file_formats/v8.rs index 23d01fc..0955e4d 100644 --- a/analyzeme/src/file_formats/v8.rs +++ b/analyzeme/src/file_formats/v8.rs @@ -11,13 +11,13 @@ use crate::{Event, EventPayload, LightweightEvent, Timestamp}; use decodeme::Metadata; -use decodeme_10_1_2::event_payload::EventPayload as OldEventPayload; -use decodeme_10_1_2::event_payload::Timestamp as OldTimestamp; -use decodeme_10_1_2::lightweight_event::LightweightEvent as OldLightweightEvent; -pub use decodeme_10_1_2::EventDecoder; -use decodeme_10_1_2::Metadata as OldMetadata; +use decodeme_10::event_payload::EventPayload as OldEventPayload; +use decodeme_10::event_payload::Timestamp as OldTimestamp; +use decodeme_10::lightweight_event::LightweightEvent as OldLightweightEvent; +pub use decodeme_10::EventDecoder; +use decodeme_10::Metadata as OldMetadata; -pub const FILE_FORMAT: u32 = measureme_10_1_2::file_header::CURRENT_FILE_FORMAT_VERSION; +pub const FILE_FORMAT: u32 = measureme_10::file_header::CURRENT_FILE_FORMAT_VERSION; // NOTE: These are functionally a hand-rolled "impl From -> New", but // given orphan rules, it seems undesirable to spread version-specific