michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-17 06:47:49 +00:00
Code Issues Projects Releases Wiki Activity

Run rustfmt

Browse Source
This commit is contained in:
Philipp Oppermann
2018-04-02 17:34:37 +02:00
parent 5d0503e250
commit 21fb890328
4 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
blog/content/second-edition/posts/02-minimal-rust-kernel/index.md
View File

@@ -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 #[lang = "panic_fmt"] // define a function that should be called on panic
#[no_mangle] #[no_mangle]
pub extern "C" fn rust_begin_panic(_msg: core::fmt::Arguments, pub extern "C" fn rust_begin_panic(
_file: &'static str, _line: u32, _column: u32) -> ! _msg: core::fmt::Arguments,
{ _file: &'static str,
_line: u32,
_column: u32,
) -> ! {
loop {} loop {}
} }

2
blog/content/second-edition/posts/03-vga-text-buffer/index.md
View File

@@ -364,7 +364,7 @@ impl Writer {
self.buffer.chars[row - 1][col].write(character); self.buffer.chars[row - 1][col].write(character);
} }
} }
self.clear_row(BUFFER_HEIGHT-1); self.clear_row(BUFFER_HEIGHT - 1);
self.column_position = 0; self.column_position = 0;
} }

8
src/main.rs
View File

@@ -3,9 +3,9 @@
#![no_std] // don't link the Rust standard library #![no_std] // don't link the Rust standard library
#![no_main] // disable all Rust-level entry points #![no_main] // disable all Rust-level entry points
extern crate volatile;
extern crate rlibc; extern crate rlibc;
extern crate spin; extern crate spin;
extern crate volatile;
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
@@ -24,9 +24,11 @@ pub extern "C" fn _start() -> ! {
/// This function is called on panic. /// This function is called on panic.
#[lang = "panic_fmt"] #[lang = "panic_fmt"]
#[no_mangle] #[no_mangle]
pub extern "C" fn rust_begin_panic(_msg: core::fmt::Arguments, pub extern "C" fn rust_begin_panic(
_msg: core::fmt::Arguments,
_file: &'static str, _file: &'static str,
_line: u32, _line: u32,
_column: u32) -> ! { _column: u32,
) -> ! {
loop {} loop {}
} }

2
src/vga_buffer.rs
View File

@@ -119,7 +119,7 @@ impl Writer {
self.buffer.chars[row - 1][col].write(character); self.buffer.chars[row - 1][col].write(character);
} }
} }
self.clear_row(BUFFER_HEIGHT-1); self.clear_row(BUFFER_HEIGHT - 1);
self.column_position = 0; self.column_position = 0;
} }