Skip to content

Commit

Permalink
Update to puffin 0.17 (#3581)
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk authored Nov 19, 2023
1 parent 30ee478 commit 7bfaf49
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 15 deletions.
13 changes: 6 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 1 addition & 1 deletion crates/eframe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion crates/egui-wgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
2 changes: 1 addition & 1 deletion crates/egui-winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
2 changes: 1 addition & 1 deletion crates/egui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 1 addition & 1 deletion crates/egui_extras/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion crates/egui_glow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions examples/puffin_profiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 7bfaf49

Please sign in to comment.