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

Compare commits

base: michaelkuc6:1519a178031d2e1724cde8433bba80bd1671c887
Branches Tags
michaelkuc6:main michaelkuc6:post-04 michaelkuc6:post-05 michaelkuc6:post-06 michaelkuc6:post-07 michaelkuc6:post-08 michaelkuc6:post-09 michaelkuc6:post-10 michaelkuc6:post-11 michaelkuc6:post-12 michaelkuc6:post-03 michaelkuc6:post-02 michaelkuc6:edition-3 michaelkuc6:post-01 michaelkuc6:post-3.3 michaelkuc6:post-3.2 michaelkuc6:threads michaelkuc6:post-3.1 michaelkuc6:edition-3-uefi-app michaelkuc6:post-12-new-bootloader michaelkuc6:post-04-no-more-bootimage michaelkuc6:post-12-test-default-handler michaelkuc6:post-12-wip2 michaelkuc6:post-12-scancode-stream michaelkuc6:post-12-async-await michaelkuc6:post-06-stack-align michaelkuc6:post-12-wip michaelkuc6:code-heap-old michaelkuc6:rust-wip
michaelkuc6:first_edition_post_10 michaelkuc6:first_edition_post_9 michaelkuc6:first_edition_post_8 michaelkuc6:first_edition_post_7 michaelkuc6:first_edition_post_6 michaelkuc6:first_edition_post_5 michaelkuc6:first_edition_post_4 michaelkuc6:first_edition_post_3 michaelkuc6:first_edition_post_2 michaelkuc6:first_edition_post_1 michaelkuc6:returning_from_exceptions michaelkuc6:better_exception_messages michaelkuc6:catching_exceptions
...
compare: michaelkuc6:afeed7477bb19a29d94a96b8b0620fd241b0d55f
Branches Tags
michaelkuc6:main michaelkuc6:post-04 michaelkuc6:post-05 michaelkuc6:post-06 michaelkuc6:post-07 michaelkuc6:post-08 michaelkuc6:post-09 michaelkuc6:post-10 michaelkuc6:post-11 michaelkuc6:post-12 michaelkuc6:post-03 michaelkuc6:post-02 michaelkuc6:edition-3 michaelkuc6:post-01 michaelkuc6:post-3.3 michaelkuc6:post-3.2 michaelkuc6:threads michaelkuc6:post-3.1 michaelkuc6:edition-3-uefi-app michaelkuc6:post-12-new-bootloader michaelkuc6:post-04-no-more-bootimage michaelkuc6:post-12-test-default-handler michaelkuc6:post-12-wip2 michaelkuc6:post-12-scancode-stream michaelkuc6:post-12-async-await michaelkuc6:post-06-stack-align michaelkuc6:post-12-wip michaelkuc6:code-heap-old michaelkuc6:rust-wip
michaelkuc6:first_edition_post_10 michaelkuc6:first_edition_post_9 michaelkuc6:first_edition_post_8 michaelkuc6:first_edition_post_7 michaelkuc6:first_edition_post_6 michaelkuc6:first_edition_post_5 michaelkuc6:first_edition_post_4 michaelkuc6:first_edition_post_3 michaelkuc6:first_edition_post_2 michaelkuc6:first_edition_post_1 michaelkuc6:returning_from_exceptions michaelkuc6:better_exception_messages michaelkuc6:catching_exceptions

4 Commits
1519a17803 ... afeed7477b

Author SHA1 Message Date
Philipp Oppermann
afeed7477b Merge pull request #1106 from asami-kawasaki/delete-unnecessary-brackets 
Delete unnecessary brackets
 2022-05-17 09:26:36 +02:00
asami
611698ec5f Delete unnecessary brackets 2022-05-17 14:57:54 +09:00
Philipp Oppermann
c34db52262 Merge pull request #1105 from MysticalUser/patch-1 
Fix minor grammar mistakes
 2022-05-16 17:42:54 +02:00
MysticalUser
71870a05b0 Fix minor grammar mistakes 2022-05-15 15:46:34 -04:00
2 changed files with 3 additions and 3 deletions
Expand all files Collapse all files

2
blog/content/edition-2/posts/05-cpu-exceptions/index.md
View File

@@ -432,7 +432,7 @@ pub extern "C" fn _start() -> ! {
} }
``` ```
Remember, this `_start` function is used when running `cargo test --lib`, since Rust's tests the `lib.rs` completely independent of the `main.rs`. We need to call `init` here to set up an IDT before running the tests. Remember, this `_start` function is used when running `cargo test --lib`, since Rust tests the `lib.rs` completely independently of the `main.rs`. We need to call `init` here to set up an IDT before running the tests.
Now we can create a `test_breakpoint_exception` test: Now we can create a `test_breakpoint_exception` test:

4
blog/content/edition-2/posts/12-async-await/index.ja.md
View File

@@ -425,7 +425,7 @@ ExampleStateMachine::WaitingOnFooTxt(state) => {
}; };
*self = ExampleStateMachine::WaitingOnBarTxt(state); *self = ExampleStateMachine::WaitingOnBarTxt(state);
} else { } else {
*self = ExampleStateMachine::End(EndState)); *self = ExampleStateMachine::End(EndState);
return Poll::Ready(content); return Poll::Ready(content);
} }
} }
@@ -446,7 +446,7 @@ ExampleStateMachine::WaitingOnBarTxt(state) => {
match state.bar_txt_future.poll(cx) { match state.bar_txt_future.poll(cx) {
Poll::Pending => return Poll::Pending, Poll::Pending => return Poll::Pending,
Poll::Ready(bar_txt) => { Poll::Ready(bar_txt) => {
*self = ExampleStateMachine::End(EndState)); *self = ExampleStateMachine::End(EndState);
// from body of `example` // from body of `example`
return Poll::Ready(state.content + &bar_txt); return Poll::Ready(state.content + &bar_txt);
} }