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

Fix syntax errors in first construct_buffer() version

Browse Source
This commit is contained in:
Philipp Oppermann
2018-05-04 18:12:08 +02:00
parent ba266f31c5
commit cb1fa395b1
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
blog/content/second-edition/posts/04-unit-testing/index.md
View File

@@ -214,12 +214,15 @@ So how do we create a `Buffer` instance? The naive approach does not work unfort
```rust
fn construct_buffer() -> Buffer {
let empty_char = ScreenChar {
ascii_character: b' ',
color_code: ColorCode::new(Color)
}
Buffer {
chars: [[Volatile::new(empty_char); BUFFER_WIDTH]; BUFFER_HEIGHT],
chars: [[Volatile::new(empty_char()); BUFFER_WIDTH]; BUFFER_HEIGHT],
}
}
fn empty_char() -> ScreenChar {
ScreenChar {
ascii_character: b' ',
color_code: ColorCode::new(Color::Green, Color::Brown),
}
}
```
@@ -271,13 +274,6 @@ fn construct_buffer() -> Buffer {
chars: array_init(|_| array_init(|_| Volatile::new(empty_char()))),
}
}
fn empty_char() -> ScreenChar {
ScreenChar {
ascii_character: b' ',
color_code: ColorCode::new(Color::Green, Color::Brown),
}
}
```
See the [documentation of `array_init`][`array_init`] for more information about using that crate.