Skip to content

Commit

Permalink
Pin to 10.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
smklein committed Dec 14, 2023
1 parent 80f9c51 commit 95da6df
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions analyzeme/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ serde = { version = "1.0", features = ["derive"] }
analyzeme_9_2_0 = { package = "analyzeme", git = "https://github.com/rust-lang/measureme", tag = "9.2.0" }

# File format: v8
decodeme_10_1_1 = { package = "decodeme", git = "https://github.com/rust-lang/measureme", tag = "10.1.1" }
measureme_10_1_1 = { package = "measureme", git = "https://github.com/rust-lang/measureme", tag = "10.1.1" }
decodeme_10_1_2 = { package = "decodeme", git = "https://github.com/rust-lang/measureme", tag = "10.1.2" }
measureme_10_1_2 = { package = "measureme", git = "https://github.com/rust-lang/measureme", tag = "10.1.2" }

[dev-dependencies]
flate2 = "1.0"
12 changes: 6 additions & 6 deletions analyzeme/src/file_formats/v8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

use crate::{Event, EventPayload, LightweightEvent, Timestamp};
use decodeme::Metadata;
use decodeme_10_1_1::event_payload::EventPayload as OldEventPayload;
use decodeme_10_1_1::event_payload::Timestamp as OldTimestamp;
use decodeme_10_1_1::lightweight_event::LightweightEvent as OldLightweightEvent;
pub use decodeme_10_1_1::EventDecoder;
use decodeme_10_1_1::Metadata as OldMetadata;
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;

pub const FILE_FORMAT: u32 = measureme_10_1_1::file_header::CURRENT_FILE_FORMAT_VERSION;
pub const FILE_FORMAT: u32 = measureme_10_1_2::file_header::CURRENT_FILE_FORMAT_VERSION;

// NOTE: These are functionally a hand-rolled "impl From<Old> -> New", but
// given orphan rules, it seems undesirable to spread version-specific
Expand Down

0 comments on commit 95da6df

Please sign in to comment.