diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd3d02f8..b1ec2a09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: branches: [ master ] jobs: - build-test: + lint: runs-on: ubuntu-latest steps: diff --git a/libkernel/src/fs/filesystems/fat32/fat.rs b/libkernel/src/fs/filesystems/fat32/fat.rs index 03c670d6..e98612a3 100644 --- a/libkernel/src/fs/filesystems/fat32/fat.rs +++ b/libkernel/src/fs/filesystems/fat32/fat.rs @@ -89,8 +89,10 @@ impl Fat { dev.read_at(bpb.sector_offset(sec), &mut buf).await?; fat.extend( - buf.chunks_exact(4) - .map(|chunk| u32::from_le_bytes(chunk.try_into().unwrap())) + buf.as_chunks::<4>() + .0 + .iter() + .map(|chunk| u32::from_le_bytes(*chunk)) .map(|v| v.into()), ); } diff --git a/src/main.rs b/src/main.rs index b41c707d..36422704 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,7 +2,6 @@ #![no_main] #![feature(used_with_arg)] #![feature(likely_unlikely)] -#![feature(box_as_ptr)] #![allow(internal_features)] #![cfg_attr(test, feature(core_intrinsics))] #![feature(custom_test_frameworks)] diff --git a/src/testing/mod.rs b/src/testing/mod.rs index 229f325a..540b2fcf 100644 --- a/src/testing/mod.rs +++ b/src/testing/mod.rs @@ -84,9 +84,8 @@ macro_rules! ktest_impl { ) }; match result { - 0 => crate::testing::TestResult::Ok, - 1 => crate::testing::TestResult::Failed, - _ => unreachable!("catch_unwind should only return 0 or 1"), + false => crate::testing::TestResult::Ok, + true => crate::testing::TestResult::Failed, } }, };