Skip to content

Commit 85c3536

Browse files
asensio-projectasensio-project
authored
Fix warnings from Clippy (#336)
1 parent b2d744b commit 85c3536

File tree

19 files changed

+40
-43
lines changed

19 files changed

+40
-43
lines changed

‎api/build.rs

+7-8
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ fn main() {
3434
i = i,
3535
j = j,
3636
a = (0..i)
37-
.map(|idx| format!("a[{}]", idx))
37+
.map(|idx| format!("a[{idx}]"))
3838
.collect::<Vec<_>>()
3939
.join(","),
4040
b = (0..j)
41-
.map(|idx| format!("b[{}]", idx))
41+
.map(|idx| format!("b[{idx}]"))
4242
.collect::<Vec<_>>()
4343
.join(","),
4444
);
@@ -56,12 +56,11 @@ fn main() {
5656
Path::new(&out_dir).join("version_info.rs"),
5757
format!(
5858
"
59-
pub const VERSION_MAJOR: u16 = {};
60-
pub const VERSION_MINOR: u16 = {};
61-
pub const VERSION_PATCH: u16 = {};
62-
pub const VERSION_PRE: bool = {};
63-
",
64-
version_major, version_minor, version_patch, pre_release
59+
pub const VERSION_MAJOR: u16 = {version_major};
60+
pub const VERSION_MINOR: u16 = {version_minor};
61+
pub const VERSION_PATCH: u16 = {version_patch};
62+
pub const VERSION_PRE: bool = {pre_release};
63+
"
6564
),
6665
)
6766
.unwrap();

‎bios/stage-2/src/main.rs

+5-10
Original file line numberDiff line numberDiff line change
@@ -102,28 +102,23 @@ fn start(disk_number: u16, partition_table_start: *const u8) -> ! {
102102
let kernel_page_size = (((kernel_len - 1) / 4096) + 1) as usize;
103103
let ramdisk_start = KERNEL_DST.wrapping_add(kernel_page_size * 4096);
104104
writeln!(screen::Writer, "Loading ramdisk...").unwrap();
105-
let ramdisk_len = match try_load_file("ramdisk", ramdisk_start, &mut fs, &mut disk, disk_buffer)
106-
{
107-
Some(s) => s,
108-
None => 0u64,
109-
};
105+
let ramdisk_len =
106+
try_load_file("ramdisk", ramdisk_start, &mut fs, &mut disk, disk_buffer).unwrap_or(0u64);
110107

111108
if ramdisk_len == 0 {
112109
writeln!(screen::Writer, "No ramdisk found, skipping.").unwrap();
113110
} else {
114111
writeln!(screen::Writer, "Loaded ramdisk at {ramdisk_start:#p}").unwrap();
115112
}
116113
let config_file_start = ramdisk_start.wrapping_add(ramdisk_len.try_into().unwrap());
117-
let config_file_len = match try_load_file(
114+
let config_file_len = try_load_file(
118115
"config.json",
119116
config_file_start,
120117
&mut fs,
121118
&mut disk,
122119
disk_buffer,
123-
) {
124-
Some(s) => s,
125-
None => 0u64,
126-
};
120+
)
121+
.unwrap_or(0);
127122

128123
let memory_map = unsafe { memory_map::query_memory_map() }.unwrap();
129124
writeln!(screen::Writer, "{memory_map:x?}").unwrap();

‎common/src/logger.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl LockedLogger {
2727
};
2828

2929
let serial = match serial_logger_status {
30-
true => Some(Spinlock::new(SerialPort::new())),
30+
true => Some(Spinlock::new(unsafe { SerialPort::init() })),
3131
false => None,
3232
};
3333

‎common/src/serial.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ pub struct SerialPort {
55
}
66

77
impl SerialPort {
8-
pub fn new() -> Self {
8+
/// # Safety
9+
///
10+
/// unsafe because this function must only be called once
11+
pub unsafe fn init() -> Self {
912
let mut port = unsafe { uart_16550::SerialPort::new(0x3F8) };
1013
port.init();
1114
Self { port }

‎tests/test_kernels/config_file/src/bin/basic_boot.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ use test_kernel_config_file::{exit_qemu, serial, QemuExitCode};
88
entry_point!(kernel_main);
99

1010
fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
11-
writeln!(serial(), "Entered kernel with boot info: {:?}", boot_info).unwrap();
11+
writeln!(serial(), "Entered kernel with boot info: {boot_info:?}").unwrap();
1212
exit_qemu(QemuExitCode::Success);
1313
}
1414

1515
/// This function is called on panic.
1616
#[panic_handler]
1717
#[cfg(not(test))]
1818
fn panic(info: &core::panic::PanicInfo) -> ! {
19-
let _ = writeln!(serial(), "PANIC: {}", info);
19+
let _ = writeln!(serial(), "PANIC: {info}");
2020
exit_qemu(QemuExitCode::Failed);
2121
}

‎tests/test_kernels/config_file/src/bin/basic_boot_broken_config_file.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ use test_kernel_config_file::{exit_qemu, serial, QemuExitCode};
88
entry_point!(kernel_main);
99

1010
fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
11-
writeln!(serial(), "Entered kernel with boot info: {:?}", boot_info).unwrap();
11+
writeln!(serial(), "Entered kernel with boot info: {boot_info:?}").unwrap();
1212
exit_qemu(QemuExitCode::Success);
1313
}
1414

1515
/// This function is called on panic.
1616
#[panic_handler]
1717
#[cfg(not(test))]
1818
fn panic(info: &core::panic::PanicInfo) -> ! {
19-
let _ = writeln!(serial(), "PANIC: {}", info);
19+
let _ = writeln!(serial(), "PANIC: {info}");
2020
exit_qemu(QemuExitCode::Failed);
2121
}

‎tests/test_kernels/default_settings/src/bin/basic_boot.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ use test_kernel_default_settings::{exit_qemu, serial, QemuExitCode};
88
entry_point!(kernel_main);
99

1010
fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
11-
writeln!(serial(), "Entered kernel with boot info: {:?}", boot_info).unwrap();
11+
writeln!(serial(), "Entered kernel with boot info: {boot_info:?}").unwrap();
1212
exit_qemu(QemuExitCode::Success);
1313
}
1414

1515
/// This function is called on panic.
1616
#[panic_handler]
1717
#[cfg(not(test))]
1818
fn panic(info: &core::panic::PanicInfo) -> ! {
19-
let _ = writeln!(serial(), "PANIC: {}", info);
19+
let _ = writeln!(serial(), "PANIC: {info}");
2020
exit_qemu(QemuExitCode::Failed);
2121
}

‎tests/test_kernels/default_settings/src/bin/check_boot_info.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
4545
fn panic(info: &core::panic::PanicInfo) -> ! {
4646
use core::fmt::Write;
4747

48-
let _ = writeln!(test_kernel_default_settings::serial(), "PANIC: {}", info);
48+
let _ = writeln!(test_kernel_default_settings::serial(), "PANIC: {info}");
4949
exit_qemu(QemuExitCode::Failed);
5050
}

‎tests/test_kernels/higher_half/src/bin/check_boot_info.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
4545
fn panic(info: &core::panic::PanicInfo) -> ! {
4646
use core::fmt::Write;
4747

48-
let _ = writeln!(test_kernel_higher_half::serial(), "PANIC: {}", info);
48+
let _ = writeln!(test_kernel_higher_half::serial(), "PANIC: {info}");
4949
exit_qemu(QemuExitCode::Failed);
5050
}

‎tests/test_kernels/higher_half/src/bin/verify_higher_half.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
3434
fn panic(info: &core::panic::PanicInfo) -> ! {
3535
use core::fmt::Write;
3636

37-
let _ = writeln!(test_kernel_higher_half::serial(), "PANIC: {}", info);
37+
let _ = writeln!(test_kernel_higher_half::serial(), "PANIC: {info}");
3838
exit_qemu(QemuExitCode::Failed);
3939
}

‎tests/test_kernels/lto/src/bin/basic_boot.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ fn kernel_main(_boot_info: &'static mut BootInfo) -> ! {
1616
fn panic(info: &core::panic::PanicInfo) -> ! {
1717
use core::fmt::Write;
1818

19-
let _ = writeln!(test_kernel_lto::serial(), "PANIC: {}", info);
19+
let _ = writeln!(test_kernel_lto::serial(), "PANIC: {info}");
2020
exit_qemu(QemuExitCode::Failed);
2121
}

‎tests/test_kernels/map_phys_mem/src/bin/access_phys_mem.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ fn panic(info: &core::panic::PanicInfo) -> ! {
2222
use core::fmt::Write;
2323
use test_kernel_map_phys_mem::serial;
2424

25-
let _ = writeln!(serial(), "PANIC: {}", info);
25+
let _ = writeln!(serial(), "PANIC: {info}");
2626
exit_qemu(QemuExitCode::Failed);
2727
}

‎tests/test_kernels/map_phys_mem/src/bin/check_boot_info.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ fn panic(info: &core::panic::PanicInfo) -> ! {
4949
use core::fmt::Write;
5050
use test_kernel_map_phys_mem::serial;
5151

52-
let _ = writeln!(serial(), "PANIC: {}", info);
52+
let _ = writeln!(serial(), "PANIC: {info}");
5353
exit_qemu(QemuExitCode::Failed);
5454
}

‎tests/test_kernels/pie/src/bin/basic_boot.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ fn kernel_main(_boot_info: &'static mut BootInfo) -> ! {
1616
fn panic(info: &core::panic::PanicInfo) -> ! {
1717
use core::fmt::Write;
1818

19-
let _ = writeln!(test_kernel_pie::serial(), "PANIC: {}", info);
19+
let _ = writeln!(test_kernel_pie::serial(), "PANIC: {info}");
2020
exit_qemu(QemuExitCode::Failed);
2121
}

‎tests/test_kernels/pie/src/bin/check_boot_info.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
4545
fn panic(info: &core::panic::PanicInfo) -> ! {
4646
use core::fmt::Write;
4747

48-
let _ = writeln!(test_kernel_pie::serial(), "PANIC: {}", info);
48+
let _ = writeln!(test_kernel_pie::serial(), "PANIC: {info}");
4949
exit_qemu(QemuExitCode::Failed);
5050
}

‎tests/test_kernels/pie/src/bin/global_variable.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ fn kernel_main(_boot_info: &'static mut BootInfo) -> ! {
3131
fn panic(info: &core::panic::PanicInfo) -> ! {
3232
use core::fmt::Write;
3333

34-
let _ = writeln!(test_kernel_pie::serial(), "PANIC: {}", info);
34+
let _ = writeln!(test_kernel_pie::serial(), "PANIC: {info}");
3535
exit_qemu(QemuExitCode::Failed);
3636
}

‎tests/test_kernels/ramdisk/src/bin/basic_boot.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ fn kernel_main(_boot_info: &'static mut BootInfo) -> ! {
1616
fn panic(info: &core::panic::PanicInfo) -> ! {
1717
use core::fmt::Write;
1818

19-
let _ = writeln!(test_kernel_ramdisk::serial(), "PANIC: {}", info);
19+
let _ = writeln!(test_kernel_ramdisk::serial(), "PANIC: {info}");
2020
exit_qemu(QemuExitCode::Failed);
2121
}

‎tests/test_kernels/ramdisk/src/bin/ramdisk.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use test_kernel_ramdisk::{exit_qemu, serial, QemuExitCode, RAMDISK_CONTENTS};
88
entry_point!(kernel_main);
99

1010
fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
11-
writeln!(serial(), "Boot info: {:?}", boot_info).unwrap();
11+
writeln!(serial(), "Boot info: {boot_info:?}").unwrap();
1212
assert!(boot_info.ramdisk_addr.into_option().is_some());
1313
assert_eq!(boot_info.ramdisk_len as usize, RAMDISK_CONTENTS.len());
1414
let actual_ramdisk = unsafe {
@@ -17,7 +17,7 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
1717
boot_info.ramdisk_len as usize,
1818
)
1919
};
20-
writeln!(serial(), "Actual contents: {:?}", actual_ramdisk).unwrap();
20+
writeln!(serial(), "Actual contents: {actual_ramdisk:?}").unwrap();
2121
assert_eq!(RAMDISK_CONTENTS, actual_ramdisk);
2222

2323
exit_qemu(QemuExitCode::Success);
@@ -27,6 +27,6 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
2727
#[cfg(not(test))]
2828
#[panic_handler]
2929
fn panic(info: &core::panic::PanicInfo) -> ! {
30-
let _ = writeln!(test_kernel_ramdisk::serial(), "PANIC: {}", info);
30+
let _ = writeln!(test_kernel_ramdisk::serial(), "PANIC: {info}");
3131
exit_qemu(QemuExitCode::Failed);
3232
}

‎uefi/src/main.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ fn main_inner(image: Handle, mut st: SystemTable<Boot>) -> Status {
187187
.or_else(|| config_entries.find(|entry| matches!(entry.guid, cfg::ACPI_GUID)));
188188
rsdp.map(|entry| PhysAddr::new(entry.address as u64))
189189
},
190-
ramdisk_addr: ramdisk_addr,
191-
ramdisk_len: ramdisk_len,
190+
ramdisk_addr,
191+
ramdisk_len,
192192
};
193193

194194
bootloader_x86_64_common::load_and_switch_to_kernel(
@@ -382,7 +382,7 @@ fn load_file_from_tftp_boot_server(
382382
let filename = CStr8::from_bytes_with_nul(name.as_bytes()).unwrap();
383383

384384
// Determine the kernel file size.
385-
let file_size = base_code.tftp_get_file_size(&server_ip, &filename).ok()?;
385+
let file_size = base_code.tftp_get_file_size(&server_ip, filename).ok()?;
386386
let kernel_size = usize::try_from(file_size).expect("The file size should fit into usize");
387387

388388
// Allocate some memory for the kernel file.
@@ -398,7 +398,7 @@ fn load_file_from_tftp_boot_server(
398398

399399
// Load the kernel file.
400400
base_code
401-
.tftp_read_file(&server_ip, &filename, Some(slice))
401+
.tftp_read_file(&server_ip, filename, Some(slice))
402402
.expect("Failed to read kernel file from the TFTP boot server");
403403

404404
Some(slice)

0 commit comments

Comments
 (0)