diff options
| author | Aaron Hill <aa1ronham@gmail.com> | 2019-12-02 13:12:06 -0500 |
|---|---|---|
| committer | Who? Me?! <mark-i-m@users.noreply.github.com> | 2020-01-02 21:54:14 -0600 |
| commit | 5708a70893c7cd237b48bff0a1980c813c08332b (patch) | |
| tree | 35630624f0818c736bf3a9e3580cd280966e9393 /src/doc/rustc-dev-guide | |
| parent | bb1f79d856e202f604d8fead4ea493af076ff05d (diff) | |
| download | rust-5708a70893c7cd237b48bff0a1980c813c08332b.tar.gz rust-5708a70893c7cd237b48bff0a1980c813c08332b.zip | |
Update for method renames in libstd
Diffstat (limited to 'src/doc/rustc-dev-guide')
| -rw-r--r-- | src/doc/rustc-dev-guide/src/panic-implementation.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/rustc-dev-guide/src/panic-implementation.md b/src/doc/rustc-dev-guide/src/panic-implementation.md index 4dbc5e613be..4f4fb1a9891 100644 --- a/src/doc/rustc-dev-guide/src/panic-implementation.md +++ b/src/doc/rustc-dev-guide/src/panic-implementation.md @@ -38,8 +38,8 @@ Actually resolving this goes through several layers of indirection: [cfg(not(test))] [panic_handler] [unwind(allowed)] -pub fn rust_begin_panic(info: &PanicInfo<'_>) -> ! { - continue_panic_fmt(&info) +pub fn begin_panic_handler(info: &PanicInfo<'_>) -> ! { + ... } ``` @@ -49,7 +49,7 @@ The `extract` function converts the `panic_handler` attribute to a `panic_impl` Now, we have a matching `panic_handler` lang item in the `libstd`. This function goes through the same process as the `extern { fn panic_impl }` definition in `libcore`, ending up with a symbol name of `rust_begin_unwind`. At link time, the symbol refernce in `libcore` -will be resolved to the definition of `libstd` (the function called `rust_begin_panic` in the +will be resolved to the definition of `libstd` (the function called `begin_panic_handler` in the Rust source). Thus, control flow will pass from libcore to std at runtime. This allows panics from `libcore` |
