Pumpkin-MC/Pumpkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: pumpkin-world external crate compilation

Browse Source
This commit is contained in:
Alexander Medvedev 2025-12-06 10:30:03 +01:00
parent 6591d3984d
commit a2d8ca8d98
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -666,9 +666,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
[[package]]
name = "crossfire"
version = "2.1.7"
version = "2.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "121161e240fcedaef95067636249fd1200e76921a2f0b101dca1648ba6d7ffa5"
checksum = "1cdbed44ce04d3b1581f2f41713381a799fdff8cedc0abafd7ada78284063dc3"
dependencies = [
"crossbeam-queue",
"crossbeam-utils",
@ -1008,9 +1008,9 @@ checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
[[package]]
name = "flate2"
version = "1.1.5"
version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
checksum = "a2152dbcb980c05735e2a651d96011320a949eb31a0c8b38b72645ce97dec676"
dependencies = [
"crc32fast",
"miniz_oxide",
@ -2896,9 +2896,9 @@ checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
[[package]]
name = "slotmap"
version = "1.0.7"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
checksum = "811fec94324ff439b2d5e4a1cf88cc5b6c09d92358715d600b2fe91c0489b5cb"
dependencies = [
"version_check",
]

2
pumpkin-protocol/Cargo.toml
View File

@ -34,4 +34,4 @@ bitflags = "2.10.0"
[dev-dependencies]
# Validate correctness
flate2 = "1.1.5"
flate2 = "1.1.7"

8
pumpkin-world/Cargo.toml
View File

@ -14,7 +14,9 @@ futures.workspace = true
bytes.workspace = true
tokio.workspace = true
tokio = { workspace = true, features = [
"rt-multi-thread",
] }
rayon.workspace = true
uuid.workspace = true
thiserror.workspace = true
@ -46,8 +48,8 @@ tokio-util = { version = "0.7.17", features = ["rt"] }
rand = "=0.10.0-rc.5"
num_cpus = "1.17.0"
rustc-hash = "2.1.1"
slotmap = "1.0"
crossfire = "2.1.7"
slotmap = "1.1"
crossfire = "2.1.8"
[dev-dependencies]
criterion = { version = "0.8", default-features = false, features = ["html_reports", "async_tokio"] }

2
pumpkin-world/src/chunk_system.rs
View File

@ -1544,7 +1544,7 @@ impl GenerationSchedule {
{
let mut data = lock.0.lock().unwrap();
while data.contains_key(&pos) {
data = task::block_in_place(|| lock.1.wait(data).unwrap());
data = tokio::task::block_in_place(|| lock.1.wait(data).unwrap());
}
}
level

2
pumpkin/Cargo.toml
View File

@ -91,7 +91,7 @@ tokio-util = { version = "0.7.17", features = ["rt"] }
# Memory profiling
dhat = { version = "0.3.3", optional = true }
flate2 = "1.1.5"
flate2 = "1.1.7"
console-subscriber = { version = "0.5.0", optional = true }
signature = "2.2.0"
[dev-dependencies]