Skip to content

Commit e9077a0

Browse files
misc(kernel): bump dependencies
* Bump dependencies * Remove `cfg_if` since now we have the `cfg_match` macro in `core` :) Signed-off-by: Anhad Singh <[email protected]>
1 parent f7cd1a0 commit e9077a0

File tree

4 files changed

+36
-33
lines changed

4 files changed

+36
-33
lines changed

src/Cargo.lock

Lines changed: 25 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/aero_kernel/Cargo.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,21 @@ bitflags = "1.2.1"
3030
bit_field = "0.10.2"
3131
log = "0.4.19"
3232
xmas-elf = "0.9.0"
33-
hashbrown = "0.14.0"
33+
hashbrown = "0.14.1"
3434
rustc-demangle = "0.1.23"
3535
# intrusive-collections:
3636
# `nightly`: Get access to const variants of the functions.
37-
intrusive-collections = { version = "0.9.5", features = ["nightly"] }
37+
intrusive-collections = { version = "0.9.6", features = ["nightly"] }
3838
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
3939
lai = { git = "https://github.com/aero-os/lai-rs" }
4040
uapi = { path = "../uapi" }
4141
cpio_reader = { git = "https://github.com/Andy-Python-Programmer/cpio_reader" }
4242
static_assertions = "1.1.0"
43-
lru = "0.10.0"
44-
bytemuck = "1.13.1"
43+
lru = "0.11.1"
44+
bytemuck = "1.14.0"
4545
limine = { git = "https://github.com/limine-bootloader/limine-rs" }
46-
cfg-if = "1.0"
4746
num-traits = { version = "0.2", default-features = false }
48-
vte = { git = "https://github.com/alacritty/vte", features = ["ansi"] }
47+
vte = { version = "0.12.0", features = ["ansi"] }
4948

5049
byte_endian = { git = "https://github.com/aero-os/byte_endian" }
5150
crabnet = { git = "https://github.com/aero-os/crabnet" }

src/aero_kernel/src/drivers/mod.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ pub mod pci;
3333
pub mod pty;
3434
pub mod tty;
3535

36-
cfg_if::cfg_if! {
37-
if #[cfg(target_arch = "x86_64")] {
36+
cfg_match! {
37+
cfg(target_arch = "x86_64") => {
3838
pub mod uart_16550;
3939
pub use self::uart_16550 as uart;
40-
} else if #[cfg(target_arch = "aarch64")] {
40+
}
41+
42+
cfg(target_arch = "aarch64") => {
4143
pub mod uart_pl011;
4244
pub use self::uart_pl011 as uart;
4345
}

src/aero_kernel/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
const_ptr_is_null, // https://github.com/rust-lang/rust/issues/74939
4848
trait_upcasting, // https://github.com/rust-lang/rust/issues/65991
4949
naked_functions, // https://github.com/rust-lang/rust/issues/32408
50+
cfg_match, // https://github.com/rust-lang/rust/issues/115585
5051
strict_provenance
5152
)]
5253
// TODO(andypython): can we remove the dependency of "prelude_import" and "lang_items"?

0 commit comments

Comments
 (0)