Skip to content
This repository was archived by the owner on Jul 17, 2025. It is now read-only.

Commit 3c47974

Browse files
committed
Switch to newer fallible_collections.
Compiler updates made older version break.
1 parent 2851f07 commit 3c47974

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

kernel/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ bit_field = "0.10"
4646
crossbeam-queue = { version = "0.3", default-features = false, features = ["alloc"] }
4747
arrayvec = { version = "0.7.0", default-features = false }
4848
memoffset = { version = "0.6.5", features = ["unstable_const"] }
49-
fallible_collections = { git = "https://github.com/gz/fallible_collections.git", branch = "allocator_api", features = ["unstable", "rust_1_57"] }
49+
fallible_collections = { path = "../../fallible_collections", features = ["unstable", "rust_1_57"] }
5050
# Should be optional (but currently aren't, TODO)
5151
gimli = { version = "0.26", default-features = false, features = ["read", "endian-reader"] }
5252
gdbstub = { git = "https://github.com/daniel5151/gdbstub.git", branch = "dev/0.6", default-features = false, features = ["alloc"] }

kernel/src/error.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,12 @@ impl From<alloc::collections::TryReserveError> for KError {
195195
}
196196
}
197197

198+
impl From<fallible_collections::TryReserveError> for KError {
199+
fn from(_e: fallible_collections::TryReserveError) -> Self {
200+
KError::OutOfMemory
201+
}
202+
}
203+
198204
impl From<hashbrown::TryReserveError> for KError {
199205
fn from(_e: hashbrown::TryReserveError) -> Self {
200206
KError::OutOfMemory

0 commit comments

Comments
 (0)