Skip to content

Commit

Permalink
trivial: cargo update and fix lints
Browse files Browse the repository at this point in the history
Update Rust and dependencies and fix resulting lints.

Signed-off-by: Dan Cross <cross@gajendra.net>
  • Loading branch information
Dan Cross authored and dancrossnyc committed Sep 17, 2024
1 parent 2eea9c5 commit a53fad8
Show file tree
Hide file tree
Showing 7 changed files with 86 additions and 78 deletions.
133 changes: 70 additions & 63 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion monitor/src/cons.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

use uart::arch::Uart;

pub(crate) type Error = core::convert::Infallible;
pub(crate) type Error = ();
pub(crate) type Result<T> = core::result::Result<T, Error>;

fn readline<'a>(uart: &mut Uart, prompt: &str, line: &'a mut [u8]) -> Result<&'a [u8]> {
Expand Down
2 changes: 1 addition & 1 deletion theon/src/allocator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,6 @@ mod global {
static mut ALLOC: QuickFit = QuickFit::new(BumpAlloc::new(unsafe {
Block::new_from_raw_parts(ptr::addr_of_mut!(HEAP).cast(), mem::size_of::<GlobalHeap>())
}));
unsafe { ptr::addr_of_mut!(ALLOC) }
ptr::addr_of_mut!(ALLOC)
}));
}
1 change: 0 additions & 1 deletion theon/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// https://opensource.org/licenses/MIT.

#![feature(allocator_api)]
#![feature(const_mut_refs)]
#![feature(exposed_provenance)]
#![feature(naked_functions)]
#![feature(ptr_sub_ptr)]
Expand Down
1 change: 0 additions & 1 deletion x86_64/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
//! page in some address space. The page may or may
//! not be mapped.
#![feature(asm_const)]
#![feature(assert_matches)]
#![feature(fn_align)]
#![feature(naked_functions)]
Expand Down
Loading

0 comments on commit a53fad8

Please # to comment.