Skip to content

Commit 1561954

Browse files
committed
Documentation
1 parent eb5fb21 commit 1561954

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/doc/unstable-book/src/language-features/lang-items.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ pub extern fn rust_eh_unwind_resume() {
143143
#[no_mangle]
144144
pub extern fn rust_begin_panic(_msg: core::fmt::Arguments,
145145
_file: &'static str,
146-
_line: u32) -> ! {
146+
_line: u32,
147+
_column: u32) -> ! {
147148
unsafe { intrinsics::abort() }
148149
}
149150
```
@@ -187,7 +188,8 @@ pub extern fn rust_eh_unwind_resume() {
187188
#[no_mangle]
188189
pub extern fn rust_begin_panic(_msg: core::fmt::Arguments,
189190
_file: &'static str,
190-
_line: u32) -> ! {
191+
_line: u32,
192+
_column: u32) -> ! {
191193
unsafe { intrinsics::abort() }
192194
}
193195
```

src/libcore/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
//! These functions are often provided by the system libc, but can also be
3737
//! provided by the [rlibc crate](https://crates.io/crates/rlibc).
3838
//!
39-
//! * `rust_begin_panic` - This function takes three arguments, a
40-
//! `fmt::Arguments`, a `&'static str`, and a `u32`. These three arguments
39+
//! * `rust_begin_panic` - This function takes four arguments, a
40+
//! `fmt::Arguments`, a `&'static str`, and two `u32`'s. These four arguments
4141
//! dictate the panic message, the file at which panic was invoked, and the
4242
//! line and column inside the file. It is up to consumers of this core
4343
//! library to define this panic function; it is only required to never

0 commit comments

Comments
 (0)