From 083d61fccdfc9d967a12be09b18d4546e2313580 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Mon, 10 Jul 2023 12:29:01 +0200 Subject: [PATCH] Update to puffin 0.16 (#3144) --- Cargo.lock | 69 +++++------------------------ crates/eframe/Cargo.toml | 2 +- crates/egui-wgpu/Cargo.toml | 2 +- crates/egui-winit/Cargo.toml | 2 +- crates/egui_glow/Cargo.toml | 2 +- examples/puffin_profiler/Cargo.toml | 4 +- 6 files changed, 18 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e7f111112..c781b851b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2223,6 +2223,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "lz4_flex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8c72594ac26bfd34f2d99dfced2edfaddfe8a476e3ff2ca0eb293d925c4f83" + [[package]] name = "malloc_buf" version = "0.0.6" @@ -2783,26 +2789,26 @@ checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" [[package]] name = "puffin" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f99b70359a44d98fceb167734e8cc19e232fe885a547f1b622e66d8099931b6" +checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21" dependencies = [ "anyhow", "bincode", "byteorder", + "cfg-if", "instant", + "lz4_flex", "once_cell", "parking_lot", - "ruzstd", "serde", - "zstd", ] [[package]] name = "puffin_http" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfbab9321f576e78566ac0986da3992ba8c3714056a12c6e92f4b5f71865cff7" +checksum = "13bffc600c35913d282ae1e96a6ffcdf36dc7a7cdb9310e0ba15914d258c8193" dependencies = [ "anyhow", "crossbeam-channel", @@ -3075,17 +3081,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "ruzstd" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a15e661f0f9dac21f3494fe5d23a6338c0ac116a2d22c2b63010acd89467ffe" -dependencies = [ - "byteorder", - "thiserror", - "twox-hash", -] - [[package]] name = "ryu" version = "1.0.13" @@ -3683,16 +3678,6 @@ dependencies = [ "windows 0.48.0", ] -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - [[package]] name = "type-map" version = "0.5.0" @@ -4561,36 +4546,6 @@ dependencies = [ "zvariant", ] -[[package]] -name = "zstd" -version = "0.12.3+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "zvariant" version = "3.14.0" diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index 9f5a49257..87ad0a2d7 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -122,7 +122,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.15", optional = true } +puffin = { version = "0.16", optional = true } wgpu = { version = "0.16.0", optional = true } # mac: diff --git a/crates/egui-wgpu/Cargo.toml b/crates/egui-wgpu/Cargo.toml index 058789003..7fc095b2d 100644 --- a/crates/egui-wgpu/Cargo.toml +++ b/crates/egui-wgpu/Cargo.toml @@ -54,4 +54,4 @@ winit = { version = "0.28", optional = true } # Native: [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -puffin = { version = "0.15", optional = true } +puffin = { version = "0.16", optional = true } diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml index 4df7d47b1..bf3f128f3 100644 --- a/crates/egui-winit/Cargo.toml +++ b/crates/egui-winit/Cargo.toml @@ -68,7 +68,7 @@ accesskit_winit = { version = "0.14.0", optional = true } ## Enable this when generating docs. document-features = { version = "0.2", optional = true } -puffin = { version = "0.15", optional = true } +puffin = { version = "0.16", optional = true } serde = { version = "1.0", optional = true, features = ["derive"] } webbrowser = { version = "0.8.3", optional = true } diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml index a8add2d95..1c1a797cb 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.22.0", path = "../egui-winit", optional = true, default-features = false } -puffin = { version = "0.15", optional = true } +puffin = { version = "0.16", optional = true } # Web: [target.'cfg(target_arch = "wasm32")'.dependencies] diff --git a/examples/puffin_profiler/Cargo.toml b/examples/puffin_profiler/Cargo.toml index 7b372a24f..dbb048fea 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.15" -puffin_http = "0.12" +puffin = "0.16" +puffin_http = "0.13"