diff --git a/Cargo.lock b/Cargo.lock index fdaa5e915..e7fcaa2dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2444,9 +2444,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lz4_flex" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8c72594ac26bfd34f2d99dfced2edfaddfe8a476e3ff2ca0eb293d925c4f83" +checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" [[package]] name = "malloc_buf" @@ -3082,15 +3082,14 @@ checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" [[package]] name = "puffin" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21" +checksum = "39009d69b9d547c3ffa974a20648fa02f447c05bd0a664012b1ba5a5b06fb14e" dependencies = [ "anyhow", "bincode", "byteorder", "cfg-if", - "instant", "lz4_flex", "once_cell", "parking_lot", @@ -3099,9 +3098,9 @@ dependencies = [ [[package]] name = "puffin_http" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bffc600c35913d282ae1e96a6ffcdf36dc7a7cdb9310e0ba15914d258c8193" +checksum = "540d042ff82a4f4543fb2e44cf0221ba8b7d6fb7b16979840449a5ddc087486f" dependencies = [ "anyhow", "crossbeam-channel", diff --git a/Cargo.toml b/Cargo.toml index 2391820a0..e25b84d88 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,9 @@ opt-level = 2 # fast and small wasm, basically same as `opt-level = 's'` opt-level = 2 [workspace.dependencies] +puffin = "0.17" thiserror = "1.0.37" + wgpu = "0.18.0" # Use this to build wgpu with WebGL support on the Web *instead* of using WebGPU. #wgpu = { version = "0.18.0", features = ["webgl"] } diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index f59c897db..ef55b1d54 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -140,7 +140,7 @@ pollster = { version = "0.3", optional = true } # needed for wgpu # this can be done at the same time we expose x11/wayland features of winit crate. glutin = { version = "0.30", optional = true } glutin-winit = { version = "0.3.0", optional = true } -puffin = { version = "0.16", optional = true } +puffin = { workspace = true, optional = true } wgpu = { workspace = true, optional = true } # mac: diff --git a/crates/egui-wgpu/Cargo.toml b/crates/egui-wgpu/Cargo.toml index 3b7547cb2..ce6c2aa7c 100644 --- a/crates/egui-wgpu/Cargo.toml +++ b/crates/egui-wgpu/Cargo.toml @@ -55,4 +55,4 @@ winit = { version = "0.28", default-features = false, optional = true } # Native: [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -puffin = { version = "0.16", optional = true } +puffin = { workspace = true, optional = true } diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml index 8c5550def..4e687ee28 100644 --- a/crates/egui-winit/Cargo.toml +++ b/crates/egui-winit/Cargo.toml @@ -71,7 +71,7 @@ accesskit_winit = { version = "0.15.0", optional = true } ## Enable this when generating docs. document-features = { version = "0.2", optional = true } -puffin = { version = "0.16", optional = true } +puffin = { workspace = true, optional = true } serde = { version = "1.0", optional = true, features = ["derive"] } webbrowser = { version = "0.8.3", optional = true } diff --git a/crates/egui/Cargo.toml b/crates/egui/Cargo.toml index 5a6506125..b96c5f845 100644 --- a/crates/egui/Cargo.toml +++ b/crates/egui/Cargo.toml @@ -93,6 +93,6 @@ backtrace = { version = "0.3", optional = true } document-features = { version = "0.2", optional = true } log = { version = "0.4", optional = true, features = ["std"] } -puffin = { version = "0.16", optional = true } +puffin = { workspace = true, optional = true } ron = { version = "0.8", optional = true } serde = { version = "1", optional = true, features = ["derive", "rc"] } diff --git a/crates/egui_extras/Cargo.toml b/crates/egui_extras/Cargo.toml index 5712a16b2..c30d0b187 100644 --- a/crates/egui_extras/Cargo.toml +++ b/crates/egui_extras/Cargo.toml @@ -85,7 +85,7 @@ image = { version = "0.24", optional = true, default-features = false } # file feature mime_guess2 = { version = "2", optional = true, default-features = false } -puffin = { version = "0.16", optional = true } +puffin = { workspace = true, optional = true } syntect = { version = "5", optional = true, default-features = false, features = [ "default-fancy", diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml index 1f52b9b1d..63a88c064 100644 --- a/crates/egui_glow/Cargo.toml +++ b/crates/egui_glow/Cargo.toml @@ -60,7 +60,7 @@ document-features = { version = "0.2", optional = true } # Native: [target.'cfg(not(target_arch = "wasm32"))'.dependencies] egui-winit = { version = "0.23.0", path = "../egui-winit", optional = true, default-features = false } -puffin = { version = "0.16", optional = true } +puffin = { workspace = true, optional = true } # Web: [target.'cfg(target_arch = "wasm32")'.dependencies] diff --git a/examples/puffin_profiler/Cargo.toml b/examples/puffin_profiler/Cargo.toml index 334fb48f7..0df75c539 100644 --- a/examples/puffin_profiler/Cargo.toml +++ b/examples/puffin_profiler/Cargo.toml @@ -14,5 +14,5 @@ eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = "0.10" -puffin = "0.16" -puffin_http = "0.13" +puffin = "0.17" +puffin_http = "0.14"