about summary refs log tree commit diff
path: root/src/doc/rustc-dev-guide
diff options
context:
space:
mode:
authorAaron Hill <aa1ronham@gmail.com>2019-12-02 13:06:44 -0500
committerWho? Me?! <mark-i-m@users.noreply.github.com>2020-01-02 21:54:14 -0600
commit33cd0d0c9b0de1e4c4a6d1e1d6e2a8baf7c4ad58 (patch)
tree20139a9b6329ce949654531d68012a58a7028673 /src/doc/rustc-dev-guide
parent441a9229fdc3e649807ef8a4bbd7648687572b26 (diff)
downloadrust-33cd0d0c9b0de1e4c4a6d1e1d6e2a8baf7c4ad58.tar.gz
rust-33cd0d0c9b0de1e4c4a6d1e1d6e2a8baf7c4ad58.zip
Apply some fixes
Co-Authored-By: Who? Me?! <mark-i-m@users.noreply.github.com>
Diffstat (limited to 'src/doc/rustc-dev-guide')
-rw-r--r--src/doc/rustc-dev-guide/src/panic-implementation.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/doc/rustc-dev-guide/src/panic-implementation.md b/src/doc/rustc-dev-guide/src/panic-implementation.md
index d8bb4c315ae..41338ce0df4 100644
--- a/src/doc/rustc-dev-guide/src/panic-implementation.md
+++ b/src/doc/rustc-dev-guide/src/panic-implementation.md
@@ -44,7 +44,7 @@ pub fn rust_begin_panic(info: &PanicInfo<'_>) -> ! {
 ```
 
 The special `panic_handler` attribute is resolved via `src/librustc/middle/lang_items`.
-The `extract` functions convers the `panic_handler` attribute to a `panic_impl` lang item.
+The `extract` function converts the `panic_handler` attribute to a `panic_impl` lang item.
 
 Now, we have a matching `panic_impl` lang item in the `libstd`. This function goes
 through the same process as the `extern { fn panic_impl }` definition in `libcore`, ending
@@ -59,7 +59,7 @@ to go through the same infratructure that other panics use (panic hooks, unwindi
 
 This is where the actual panic-related logic begins. In `src/libstd/pancking.rs`,
 control passes to `rust_panic_with_hook`. This method is responsible
-for checking for invoking the global panic hook, and checking for double panics. Finally,
+for invoking the global panic hook, and checking for double panics. Finally,
 we call ```__rust_start_panic```, which is provided by the panic runtime.
 
 The call to ```__rust_start_panic``` is very weird - it is passed a ```*mut &mut dyn BoxMeUp```,
@@ -101,5 +101,4 @@ with each frame (currently, running destructors), and transferring control
 to the `catch_unwind` frame.
 
 Note that all panics either abort the process or get caught by some call to `catch_unwind`:
-in `src/libstd/rt.rs`, the call to the user-provided `main` function is wrapped in `catch_unwind
-
+in `src/libstd/rt.rs`, the call to the user-provided `main` function is wrapped in `catch_unwind`.