diff --git a/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md b/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md index 1b2db0fa..eb85e39b 100644 --- a/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md +++ b/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md @@ -203,9 +203,12 @@ Compiling for our new target will use Linux conventions (I'm not quite sure why, #[lang = "panic_fmt"] // define a function that should be called on panic #[no_mangle] -pub extern "C" fn rust_begin_panic(_msg: core::fmt::Arguments, - _file: &'static str, _line: u32, _column: u32) -> ! -{ +pub extern "C" fn rust_begin_panic( + _msg: core::fmt::Arguments, + _file: &'static str, + _line: u32, + _column: u32, +) -> ! { loop {} } diff --git a/blog/content/second-edition/posts/03-vga-text-buffer/index.md b/blog/content/second-edition/posts/03-vga-text-buffer/index.md index 1eaafa20..3b30fd25 100644 --- a/blog/content/second-edition/posts/03-vga-text-buffer/index.md +++ b/blog/content/second-edition/posts/03-vga-text-buffer/index.md @@ -71,22 +71,22 @@ First, we represent the different colors using an enum: #[derive(Debug, Clone, Copy)] #[repr(u8)] pub enum Color { - Black = 0, - Blue = 1, - Green = 2, - Cyan = 3, - Red = 4, - Magenta = 5, - Brown = 6, - LightGray = 7, - DarkGray = 8, - LightBlue = 9, + Black = 0, + Blue = 1, + Green = 2, + Cyan = 3, + Red = 4, + Magenta = 5, + Brown = 6, + LightGray = 7, + DarkGray = 8, + LightBlue = 9, LightGreen = 10, - LightCyan = 11, - LightRed = 12, - Pink = 13, - Yellow = 14, - White = 15, + LightCyan = 11, + LightRed = 12, + Pink = 13, + Yellow = 14, + White = 15, } ``` We use a [C-like enum] here to explicitly specify the number for each color. Because of the `repr(u8)` attribute each enum variant is stored as an `u8`. Actually 4 bits would be sufficient, but Rust doesn't have an `u4` type. @@ -364,7 +364,7 @@ impl Writer { self.buffer.chars[row - 1][col].write(character); } } - self.clear_row(BUFFER_HEIGHT-1); + self.clear_row(BUFFER_HEIGHT - 1); self.column_position = 0; } diff --git a/src/main.rs b/src/main.rs index b1295e0a..301cc121 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,9 +3,9 @@ #![no_std] // don't link the Rust standard library #![no_main] // disable all Rust-level entry points -extern crate volatile; extern crate rlibc; extern crate spin; +extern crate volatile; #[macro_use] extern crate lazy_static; @@ -24,9 +24,11 @@ pub extern "C" fn _start() -> ! { /// This function is called on panic. #[lang = "panic_fmt"] #[no_mangle] -pub extern "C" fn rust_begin_panic(_msg: core::fmt::Arguments, - _file: &'static str, - _line: u32, - _column: u32) -> ! { +pub extern "C" fn rust_begin_panic( + _msg: core::fmt::Arguments, + _file: &'static str, + _line: u32, + _column: u32, +) -> ! { loop {} } diff --git a/src/vga_buffer.rs b/src/vga_buffer.rs index 860d314c..7a0e98fe 100644 --- a/src/vga_buffer.rs +++ b/src/vga_buffer.rs @@ -18,22 +18,22 @@ lazy_static! { #[derive(Debug, Clone, Copy)] #[repr(u8)] pub enum Color { - Black = 0, - Blue = 1, - Green = 2, - Cyan = 3, - Red = 4, - Magenta = 5, - Brown = 6, - LightGray = 7, - DarkGray = 8, - LightBlue = 9, + Black = 0, + Blue = 1, + Green = 2, + Cyan = 3, + Red = 4, + Magenta = 5, + Brown = 6, + LightGray = 7, + DarkGray = 8, + LightBlue = 9, LightGreen = 10, - LightCyan = 11, - LightRed = 12, - Pink = 13, - Yellow = 14, - White = 15, + LightCyan = 11, + LightRed = 12, + Pink = 13, + Yellow = 14, + White = 15, } /// A combination of a foreground and a background color. @@ -119,7 +119,7 @@ impl Writer { self.buffer.chars[row - 1][col].write(character); } } - self.clear_row(BUFFER_HEIGHT-1); + self.clear_row(BUFFER_HEIGHT - 1); self.column_position = 0; }