Skip to content

Commit 80c88e4

Browse files
andre-richterandre-richter
committed
Bump toolchain version; Fix clippy warnings
1 parent f6f668c commit 80c88e4

File tree

20 files changed

+30
-50
lines changed

20 files changed

+30
-50
lines changed

‎06_uart_chainloader/demo_payload_rpi3.img‎

-104 Bytes
Binary file not shown.

‎06_uart_chainloader/demo_payload_rpi4.img‎

-112 Bytes
Binary file not shown.

‎10_virtual_mem_part1_identity_mapping/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ diff -uNr 09_privilege_level/src/_arch/aarch64/memory/mmu/translation_table.rs 1
602602
+ + STAGE1_PAGE_DESCRIPTOR::AF::True
603603
+ + STAGE1_PAGE_DESCRIPTOR::TYPE::Page
604604
+ + STAGE1_PAGE_DESCRIPTOR::VALID::True
605-
+ + attribute_fields.clone().into(),
605+
+ + (*attribute_fields).into(),
606606
+ );
607607
+
608608
+ Self { value: val.get() }

‎10_virtual_mem_part1_identity_mapping/src/_arch/aarch64/memory/mmu/translation_table.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ impl PageDescriptor {
235235
+ STAGE1_PAGE_DESCRIPTOR::AF::True
236236
+ STAGE1_PAGE_DESCRIPTOR::TYPE::Page
237237
+ STAGE1_PAGE_DESCRIPTOR::VALID::True
238-
+ attribute_fields.clone().into(),
238+
+ (*attribute_fields).into(),
239239
);
240240

241241
Self { value: val.get() }

‎11_exceptions_part1_groundwork/src/_arch/aarch64/memory/mmu/translation_table.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ impl PageDescriptor {
235235
+ STAGE1_PAGE_DESCRIPTOR::AF::True
236236
+ STAGE1_PAGE_DESCRIPTOR::TYPE::Page
237237
+ STAGE1_PAGE_DESCRIPTOR::VALID::True
238-
+ attribute_fields.clone().into(),
238+
+ (*attribute_fields).into(),
239239
);
240240

241241
Self { value: val.get() }

‎12_integrated_testing/src/_arch/aarch64/memory/mmu/translation_table.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ impl PageDescriptor {
235235
+ STAGE1_PAGE_DESCRIPTOR::AF::True
236236
+ STAGE1_PAGE_DESCRIPTOR::TYPE::Page
237237
+ STAGE1_PAGE_DESCRIPTOR::VALID::True
238-
+ attribute_fields.clone().into(),
238+
+ (*attribute_fields).into(),
239239
);
240240

241241
Self { value: val.get() }

‎13_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/memory/mmu/translation_table.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ impl PageDescriptor {
235235
+ STAGE1_PAGE_DESCRIPTOR::AF::True
236236
+ STAGE1_PAGE_DESCRIPTOR::TYPE::Page
237237
+ STAGE1_PAGE_DESCRIPTOR::VALID::True
238-
+ attribute_fields.clone().into(),
238+
+ (*attribute_fields).into(),
239239
);
240240

241241
Self { value: val.get() }

‎14_virtual_mem_part2_mmio_remap/README.md‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ diff -uNr 13_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/memory/mmu/trans
659659
+ phys_pages: &PageSliceDescriptor<Physical>,
660660
+ attr: &AttributeFields,
661661
+ ) -> Result<(), &'static str> {
662-
+ assert_eq!(self.initialized, true, "Translation tables not initialized");
662+
+ assert!(self.initialized, "Translation tables not initialized");
663663
+
664664
+ let p = phys_pages.as_slice();
665665
+ let v = virt_pages.as_slice();
@@ -700,7 +700,7 @@ diff -uNr 13_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/memory/mmu/trans
700700
+ &mut self,
701701
+ num_pages: usize,
702702
+ ) -> Result<PageSliceDescriptor<Virtual>, &'static str> {
703-
+ assert_eq!(self.initialized, true, "Translation tables not initialized");
703+
+ assert!(self.initialized, "Translation tables not initialized");
704704
+
705705
+ if num_pages == 0 {
706706
+ return Err("num_pages == 0");
@@ -2213,7 +2213,7 @@ diff -uNr 13_exceptions_part2_peripheral_IRQs/src/main.rs 14_virtual_mem_part2_m
22132213
diff -uNr 13_exceptions_part2_peripheral_IRQs/src/memory/mmu/mapping_record.rs 14_virtual_mem_part2_mmio_remap/src/memory/mmu/mapping_record.rs
22142214
--- 13_exceptions_part2_peripheral_IRQs/src/memory/mmu/mapping_record.rs
22152215
+++ 14_virtual_mem_part2_mmio_remap/src/memory/mmu/mapping_record.rs
2216-
@@ -0,0 +1,221 @@
2216+
@@ -0,0 +1,216 @@
22172217
+// SPDX-License-Identifier: MIT OR Apache-2.0
22182218
+//
22192219
+// Copyright (c) 2020-2021 Andre Richter <andre.o.richter@gmail.com>
@@ -2334,12 +2334,7 @@ diff -uNr 13_exceptions_part2_peripheral_IRQs/src/memory/mmu/mapping_record.rs 1
23342334
+ );
23352335
+ info!(" -------------------------------------------------------------------------------------------------------------------------------------------");
23362336
+
2337-
+ for i in self
2338-
+ .inner
2339-
+ .iter()
2340-
+ .filter(|x| x.is_some())
2341-
+ .map(|x| x.unwrap())
2342-
+ {
2337+
+ for i in self.inner.iter().flatten() {
23432338
+ let virt_start = i.virt_start_addr;
23442339
+ let virt_end_inclusive = virt_start + i.phys_pages.size() - 1;
23452340
+ let phys_start = i.phys_pages.start_addr();
@@ -2418,7 +2413,7 @@ diff -uNr 13_exceptions_part2_peripheral_IRQs/src/memory/mmu/mapping_record.rs 1
24182413
+ mmio_descriptor: &MMIODescriptor,
24192414
+ new_user: &'static str,
24202415
+) -> Option<Address<Virtual>> {
2421-
+ let phys_pages: PageSliceDescriptor<Physical> = mmio_descriptor.clone().into();
2416+
+ let phys_pages: PageSliceDescriptor<Physical> = (*mmio_descriptor).into();
24222417
+
24232418
+ KERNEL_MAPPING_RECORD.write(|mr| {
24242419
+ let dup = mr.find_duplicate(&phys_pages)?;
@@ -3068,7 +3063,7 @@ diff -uNr 13_exceptions_part2_peripheral_IRQs/src/memory/mmu.rs 14_virtual_mem_p
30683063
+ name: &'static str,
30693064
+ mmio_descriptor: &MMIODescriptor,
30703065
+) -> Result<Address<Virtual>, &'static str> {
3071-
+ let phys_pages: PageSliceDescriptor<Physical> = mmio_descriptor.clone().into();
3066+
+ let phys_pages: PageSliceDescriptor<Physical> = (*mmio_descriptor).into();
30723067
+ let offset_into_start_page =
30733068
+ mmio_descriptor.start_addr().into_usize() & bsp::memory::mmu::KernelGranule::MASK;
30743069
+

‎14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/memory/mmu/translation_table.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ impl PageDescriptor {
237237
+ STAGE1_PAGE_DESCRIPTOR::AF::True
238238
+ STAGE1_PAGE_DESCRIPTOR::TYPE::Page
239239
+ STAGE1_PAGE_DESCRIPTOR::VALID::True
240-
+ attribute_fields.clone().into(),
240+
+ (*attribute_fields).into(),
241241
);
242242

243243
Self { value: val.get() }
@@ -364,7 +364,7 @@ impl<const NUM_TABLES: usize> memory::mmu::translation_table::interface::Transla
364364
phys_pages: &PageSliceDescriptor<Physical>,
365365
attr: &AttributeFields,
366366
) -> Result<(), &'static str> {
367-
assert_eq!(self.initialized, true, "Translation tables not initialized");
367+
assert!(self.initialized, "Translation tables not initialized");
368368

369369
let p = phys_pages.as_slice();
370370
let v = virt_pages.as_slice();
@@ -399,7 +399,7 @@ impl<const NUM_TABLES: usize> memory::mmu::translation_table::interface::Transla
399399
&mut self,
400400
num_pages: usize,
401401
) -> Result<PageSliceDescriptor<Virtual>, &'static str> {
402-
assert_eq!(self.initialized, true, "Translation tables not initialized");
402+
assert!(self.initialized, "Translation tables not initialized");
403403

404404
if num_pages == 0 {
405405
return Err("num_pages == 0");

‎14_virtual_mem_part2_mmio_remap/src/memory/mmu.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ pub unsafe fn kernel_map_mmio(
182182
name: &'static str,
183183
mmio_descriptor: &MMIODescriptor,
184184
) -> Result<Address<Virtual>, &'static str> {
185-
let phys_pages: PageSliceDescriptor<Physical> = mmio_descriptor.clone().into();
185+
let phys_pages: PageSliceDescriptor<Physical> = (*mmio_descriptor).into();
186186
let offset_into_start_page =
187187
mmio_descriptor.start_addr().into_usize() & bsp::memory::mmu::KernelGranule::MASK;
188188

0 commit comments

Comments
 (0)