Skip to content

Commit

Permalink
chore(deps): update
Browse files Browse the repository at this point in the history
  • Loading branch information
GZTimeWalker committed Aug 29, 2024
1 parent cc71482 commit bc6f370
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions docs/labs/0x00/tasks.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@ use core::arch::asm;
use uefi::prelude::*;

#[entry]
fn efi_main(image: uefi::Handle, mut system_table: SystemTable<Boot>) -> Status {
uefi::helpers::init(&mut system_table).expect("Failed to initialize utilities");
fn efi_main(image: uefi::Handle, system_table: SystemTable<Boot>) -> Status {
uefi::helpers::init().expect("Failed to initialize utilities");
log::set_max_level(log::LevelFilter::Info);

let std_num = /* FIXME */;
Expand Down
2 changes: 1 addition & 1 deletion docs/labs/0x01/tasks.md
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ println!("{}", record.args());

### Panic 处理

在拥有了日志输出的能力之后可以对 panic 进行更好的处理,以便在 panic 时输出更加详细的信息。代码中已经为大家启用了 `#![feature(panic_info_message)]` 特性,并且默认给出了一个 `error!` 的输出。
在拥有了日志输出的能力之后可以对 panic 进行更好的处理,以便在 panic 时输出更加详细的信息。代码中默认给出了一个 `error!` 的输出。

`src/utils/macros.rs` 中,你可以选择按照自己的预期修改 `panic_handler` 的实现。

Expand Down
4 changes: 2 additions & 2 deletions docs/wiki/linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ wsl --install -d Ubuntu

```bash
$ rustc --version
rustc 1.79.0 (129f3b996 2024-06-10)
rustc 1.80.1 (3f5fd8dd4 2024-08-06)
$ qemu-system-x86_64 --version
QEMU emulator version 8.2.2 (Debian 1:8.2.2+ds-0ubuntu1)
Expand All @@ -104,7 +104,7 @@ GNU gdb (Ubuntu 15.0.50.20240403-0ubuntu1) 15.0.50.20240403-git

```bash
$ rustc --version
rustc 1.79.0 (129f3b996 2024-06-10)
rustc 1.80.1 (3f5fd8dd4 2024-08-06)
$ qemu-system-x86_64 --version
QEMU emulator version 6.2.0 (Debian 1:6.2+dfsg-2ubuntu6.15)
Expand Down
2 changes: 1 addition & 1 deletion src/0x00/pkg/boot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
uefi = { version = "0.28", default-features = false }
uefi = { version = "0.31", default-features = false }
log = "0.4"

[features]
Expand Down
1 change: 0 additions & 1 deletion src/0x01/pkg/kernel/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#![feature(naked_functions)]
#![feature(abi_x86_interrupt)]
#![feature(type_alias_impl_trait)]
#![feature(panic_info_message)]

#[macro_use]
extern crate log;
Expand Down
1 change: 0 additions & 1 deletion src/0x02/pkg/kernel/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#![feature(abi_x86_interrupt)]
#![feature(alloc_error_handler)]
#![feature(type_alias_impl_trait)]
#![feature(panic_info_message)]
#![feature(map_try_insert)]
#![allow(clippy::missing_safety_doc)]
#![allow(clippy::result_unit_err)]
Expand Down
2 changes: 1 addition & 1 deletion src/0x03/pkg/kernel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ bitflags = "2.3"
bit_field = "0.10"
libm = "0.2"
linked_list_allocator = "0.10"
volatile = "0.5"
volatile = "0.6"
1 change: 0 additions & 1 deletion src/0x04/pkg/lib/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#![cfg_attr(not(test), no_std)]
#![allow(dead_code, unused_imports)]
#![feature(panic_info_message)]
#![feature(alloc_error_handler)]

#[macro_use]
Expand Down
1 change: 0 additions & 1 deletion src/0x07/pkg/lib/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![allow(dead_code, unused_imports)]
#![feature(panic_info_message)]
#![feature(alloc_error_handler)]
#![cfg_attr(not(test), no_std)]

Expand Down

0 comments on commit bc6f370

Please sign in to comment.