Skip to content

Commit

Permalink
Fix CI from upstream changes:
Browse files Browse the repository at this point in the history
 - new rustc compiler error for unexpected cfg names
 - puffin making a non-semver friendly change, it needs to be pinned to 0.19.0 or upgraded
  • Loading branch information
aclysma committed Sep 28, 2024
1 parent 51a6765 commit 308bef7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 2 additions & 1 deletion demo-puffin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ categories = ["development-tools::profiling"]
[dependencies]
profiling = { path = "../profiling", features = ["profile-with-puffin"] }

puffin = "0.19.0"
# Pinned to 0.19.0 because 0.19.1 made a breaking change
puffin = "=0.19.0"
puffin_egui = "0.26.0"
egui = "0.26.2"
# wgpu also works fine here
Expand Down
4 changes: 0 additions & 4 deletions demo-puffin/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ fn some_other_function(iterations: usize) {
format!("other data {}", i).as_str()
);

// Mixing general profiling API calls with profiler-specific API calls is allowed
#[cfg(feature = "profile-with-optick")]
profiling::optick::tag!("extra_data", "MORE DATA");

some_inner_function(i);
burn_time(1);
}
Expand Down

0 comments on commit 308bef7

Please sign in to comment.