Skip to content

Commit

Permalink
chore(analyzeme): dont depend packages from Git repository
Browse files Browse the repository at this point in the history
We've released decodeme to crates.io so analyzeme can depend on it
directly from crates.io. This make the reproducibility story better
  • Loading branch information
weihanglo authored and michaelwoerister committed May 31, 2024
1 parent ff28827 commit f970118
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions analyzeme/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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_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<Old> -> New", but
// given orphan rules, it seems undesirable to spread version-specific
Expand Down

0 comments on commit f970118

Please sign in to comment.