Merge #46

46: Prepare version 0.3.13 r=phil-opp a=phil-opp



Co-authored-by: Philipp Oppermann <[email protected]>

Author: bors[bot]

Cargo.lock

@@ -2,7 +2,7 @@ cargo-features = ["publish-lockfile"]
 
 [package]
 name = "bootloader"
-version = "0.3.12"
+version = "0.3.13"
 authors = ["Philipp Oppermann <[email protected]>"]
 license = "MIT/Apache-2.0"
 description = "An experimental pure-Rust x86 bootloader."

Cargo.toml

@@ -22,8 +22,10 @@ impl MemoryMap {
     }
 
     pub fn add_region(&mut self, region: MemoryRegion) {
-        assert!(self.next_entry_index() < MAX_MEMORY_MAP_SIZE,
-            "too many memory regions in memory map");
+        assert!(
+            self.next_entry_index() < MAX_MEMORY_MAP_SIZE,
+            "too many memory regions in memory map"
+        );
         self.entries[self.next_entry_index()] = region;
         self.next_entry_index += 1;
         self.sort();

src/bootinfo/memory_map.rs

@@ -64,7 +64,7 @@ impl IdentityMappedAddr {
 }
 
 // Symbols defined in `linker.ld`
-extern {
+extern "C" {
     static mmap_ent: usize;
     static _memory_map: usize;
     static _kib_kernel_size: usize;
@@ -208,7 +208,8 @@ fn load_elf(
         &segments,
         &mut rec_page_table,
         &mut frame_allocator,
-    ).expect("kernel mapping failed");
+    )
+    .expect("kernel mapping failed");
 
     // Map a page for the boot info structure
     let boot_info_page = {
@@ -223,7 +224,8 @@ fn load_elf(
             flags,
             &mut rec_page_table,
             &mut frame_allocator,
-        ).expect("Mapping of bootinfo page failed")
+        )
+        .expect("Mapping of bootinfo page failed")
         .flush();
         page
     };

src/main.rs

@@ -91,7 +91,8 @@ pub(crate) fn map_segment(
                         page_table_flags,
                         page_table,
                         frame_allocator,
-                    )?.flush();
+                    )?
+                    .flush();
 
                     type PageArray = [u64; Size4KiB::SIZE as usize / 8];
 
@@ -119,7 +120,8 @@ pub(crate) fn map_segment(
                         page_table_flags,
                         page_table,
                         frame_allocator,
-                    )?.flush();
+                    )?
+                    .flush();
                 }
 
                 // Map additional frames.

src/page_table.rs

@@ -4,5 +4,5 @@ pub use self::vga_text_80x25::*;
 #[cfg(feature = "vga_320x200")]
 pub use self::vga_320x200::*;
 
-mod vga_text_80x25;
 mod vga_320x200;
+mod vga_text_80x25;

src/printer/mod.rs

@@ -54,7 +54,7 @@ impl Printer {
                 for (y, byte) in rendered.iter().enumerate() {
                     for (x, bit) in (0..8).enumerate() {
                         if *byte & (1 << bit) == 0 {
-                            continue
+                            continue;
                         }
                         let color = 0xf;
                         vga_buffer[(y_pos + y) * SCREEN_WIDTH + x_pos + x] = color;