Skip to content

Commit

Permalink
Update ahash to 0.8.1 (#2255)
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk committed Nov 7, 2022
1 parent 7434a7d commit e486020
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 19 deletions.
11 changes: 5 additions & 6 deletions Cargo.lock

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

17 changes: 9 additions & 8 deletions crates/eframe/Cargo.toml
Expand Up @@ -50,10 +50,7 @@ persistence = [
puffin = ["dep:puffin", "egui_glow?/puffin"]

## Enable screen reader support (requires `ctx.options().screen_reader = true;`)
screen_reader = [
"egui-winit/screen_reader",
"tts",
]
screen_reader = ["egui-winit/screen_reader", "tts"]

## Use [`wgpu`](https://docs.rs/wgpu) for painting (via [`egui-wgpu`](https://github.com/emilk/egui/tree/master/crates/egui-wgpu)).
## This overrides the `glow` feature.
Expand All @@ -79,22 +76,26 @@ serde = { version = "1", optional = true, features = ["derive"] }
# -------------------------------------------
# native:
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
egui-winit = { version = "0.19.0", path = "../egui-winit", default-features = false, features = ["clipboard", "links"] }
egui-winit = { version = "0.19.0", path = "../egui-winit", default-features = false, features = [
"clipboard",
"links",
] }
glutin = { version = "0.29.0" }
winit = "0.27.2"

# optional native:
dark-light = { version = "0.2.1", optional = true }
directories-next = { version = "2", optional = true }
egui-wgpu = { version = "0.19.0", path = "../egui-wgpu", optional = true, features = ["winit"] } # if wgpu is used, use it with winit
egui-wgpu = { version = "0.19.0", path = "../egui-wgpu", optional = true, features = [
"winit",
] }
puffin = { version = "0.13", optional = true }
wgpu = { version = "0.14", optional = true }

# -------------------------------------------
# web:
[target.'cfg(target_arch = "wasm32")'.dependencies]
bytemuck = "1.7"
getrandom = { version = "0.2", features = ["js"] } # used by ahash
js-sys = "0.3"
percent-encoding = "2.1"
wasm-bindgen = "0.2"
Expand Down Expand Up @@ -144,5 +145,5 @@ web-sys = { version = "0.3.58", features = [

# optional web:
egui-wgpu = { version = "0.19.0", path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit
tts = { version = "0.20", optional = true } # Can't use 0.21-0.24 due to compilation problems on linux
tts = { version = "0.20", optional = true } # Can't use 0.21-0.24 due to compilation problems on linux
wgpu = { version = "0.14", optional = true, features = ["webgl"] }
9 changes: 7 additions & 2 deletions crates/egui/Cargo.toml
Expand Up @@ -57,7 +57,10 @@ serde = ["dep:serde", "epaint/serde"]
[dependencies]
epaint = { version = "0.19.0", path = "../epaint", default-features = false }

ahash = "0.8"
ahash = { version = "0.8.1", default-features = false, features = [
"no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
"std",
] }
nohash-hasher = "0.2"

#! ### Optional dependencies
Expand All @@ -68,4 +71,6 @@ ron = { version = "0.8", optional = true }
serde = { version = "1", optional = true, features = ["derive", "rc"] }

# egui doesn't log much, but when it does, it uses [`tracing`](https://docs.rs/tracing).
tracing = { version = "0.1", optional = true, default-features = false, features = ["std"] }
tracing = { version = "0.1", optional = true, default-features = false, features = [
"std",
] }
5 changes: 4 additions & 1 deletion crates/egui_glium/Cargo.toml
Expand Up @@ -44,7 +44,10 @@ egui = { version = "0.19.0", path = "../egui", default-features = false, feature
] }
egui-winit = { version = "0.19.0", path = "../egui-winit", default-features = false }

ahash = "0.8"
ahash = { version = "0.8.1", default-features = false, features = [
"no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
"std",
] }
bytemuck = "1.7"
glium = "0.32"

Expand Down
7 changes: 5 additions & 2 deletions crates/epaint/Cargo.toml
Expand Up @@ -56,7 +56,10 @@ serde = ["dep:serde", "ahash/serde", "emath/serde"]
emath = { version = "0.19.0", path = "../emath" }

ab_glyph = "0.2.11"
ahash = "0.8"
ahash = { version = "0.8.1", default-features = false, features = [
"no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
"std",
] }
nohash-hasher = "0.2"

#! ### Optional dependencies
Expand All @@ -77,7 +80,7 @@ serde = { version = "1", optional = true, features = ["derive", "rc"] }
# native:
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
backtrace = { version = "0.3", optional = true }
parking_lot = "0.12" # Using parking_lot over std::sync::Mutex gives 50% speedups in some real-world scenarios.
parking_lot = "0.12" # Using parking_lot over std::sync::Mutex gives 50% speedups in some real-world scenarios.

# web:
[target.'cfg(target_arch = "wasm32")'.dependencies]
Expand Down

0 comments on commit e486020

Please sign in to comment.