Skip to content

Commit 64faf0f

Browse files
committed
Run cargo fmt
1 parent 0b06e9c commit 64faf0f

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

Diff for: bios/stage-2/src/main.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,13 @@ fn start(disk_number: u16, partition_table_start: *const u8) -> ! {
101101
let kernel_page_size = (((kernel_len - 1) / 4096) + 1) as usize;
102102
let ramdisk_start = KERNEL_DST.wrapping_add(kernel_page_size * 4096);
103103
writeln!(screen::Writer, "Loading ramdisk...").unwrap();
104-
let ramdisk_len = match try_load_file("ramdisk", KERNEL_DST.wrapping_add(kernel_page_size * 4096), &mut fs, &mut disk, disk_buffer) {
104+
let ramdisk_len = match try_load_file(
105+
"ramdisk",
106+
KERNEL_DST.wrapping_add(kernel_page_size * 4096),
107+
&mut fs,
108+
&mut disk,
109+
disk_buffer,
110+
) {
105111
Some(s) => s,
106112
None => 0u64,
107113
};

Diff for: bios/stage-4/src/main.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ pub extern "C" fn _start(info: &mut BiosInfo) -> ! {
5858
let kernel_size = info.kernel.len;
5959
let next_free_frame = match info.ramdisk.len {
6060
0 => PhysFrame::containing_address(kernel_start + kernel_size - 1u64) + 1,
61-
_ => PhysFrame::containing_address(PhysAddr::new(info.ramdisk.start + info.ramdisk.len - 1u64)) + 1
61+
_ => {
62+
PhysFrame::containing_address(PhysAddr::new(
63+
info.ramdisk.start + info.ramdisk.len - 1u64,
64+
)) + 1
65+
}
6266
};
6367
let mut frame_allocator = LegacyFrameAllocator::new_starting_at(
6468
next_free_frame,

Diff for: tests/default_settings.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use bootloader_test_runner::run_test_kernel;
44
fn basic_boot() {
55
run_test_kernel(
66
env!("CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_basic_boot"),
7-
None
7+
None,
88
);
99
}
1010

Diff for: uefi/src/main.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,11 @@ fn main_inner(image: Handle, mut st: SystemTable<Boot>) -> Status {
7373
*SYSTEM_TABLE.get() = Some(st.unsafe_clone());
7474
}
7575
st.stdout().clear().unwrap();
76-
writeln!(st.stdout(), "UEFI bootloader started; trying to load kernel").unwrap();
76+
writeln!(
77+
st.stdout(),
78+
"UEFI bootloader started; trying to load kernel"
79+
)
80+
.unwrap();
7781

7882
let mut boot_mode = BootMode::Disk;
7983
let mut kernel = load_kernel(image, &mut st, boot_mode);
@@ -439,7 +443,11 @@ fn create_page_tables(
439443
}
440444
}
441445

442-
fn init_logger(image_handle: Handle, st: &SystemTable<Boot>, config: BootloaderConfig) -> Option<RawFrameBufferInfo> {
446+
fn init_logger(
447+
image_handle: Handle,
448+
st: &SystemTable<Boot>,
449+
config: BootloaderConfig,
450+
) -> Option<RawFrameBufferInfo> {
443451
let gop_handle = st
444452
.boot_services()
445453
.get_handle_for_protocol::<GraphicsOutput>()

0 commit comments

Comments
 (0)