Merge branch 'master' into intigrate-collect-assets

This commit is contained in:
Evan Almloff committed 2023-10-10 09:57:16 -05:00
1 parent e5b15f7c31
commit b76f129083
55 files changed
+213 -5697

No files matched your search

-2
View File
@@ -16,7 +16,6 @@ keyboard-types = "0.7"
smallvec = "1.6"
rustc-hash = { workspace = true }
anymap = "1.0.0-beta.2"
slab = { workspace = true }
parking_lot = { version = "0.12.1", features = ["send_guard"] }
dashmap = "5.4.0"
@@ -24,7 +23,6 @@ dashmap = "5.4.0"
taffy = { version = "0.3.12", optional = true }
lightningcss = { version = "1.0.0-alpha.39", optional = true }
rayon = "1.6.1"
shipyard = { version = "0.6.2", features = ["proc", "std"], default-features = false }
[dev-dependencies]