Skip to content

Commit adce670

Browse files
committed
Fix up tests and docs.
1 parent bd0cf1b commit adce670

File tree

6 files changed

+17
-2
lines changed

6 files changed

+17
-2
lines changed

src/doc/trpl/custom-allocators.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ pub extern fn __rust_usable_size(size: usize, _align: usize) -> usize {
140140
# #[lang = "panic_fmt"] fn panic_fmt() {}
141141
# #[lang = "eh_personality"] fn eh_personality() {}
142142
# #[lang = "eh_unwind_resume"] extern fn eh_unwind_resume() {}
143+
# #[no_mangle] pub extern fn rust_eh_register_frames () {}
144+
# #[no_mangle] pub extern fn rust_eh_unregister_frames () {}
143145
```
144146

145147
After we compile this crate, it can be used as follows:

src/doc/trpl/lang-items.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ fn main(argc: isize, argv: *const *const u8) -> isize {
5454
#[lang = "eh_personality"] extern fn eh_personality() {}
5555
#[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} }
5656
# #[lang = "eh_unwind_resume"] extern fn rust_eh_unwind_resume() {}
57+
# #[no_mangle] pub extern fn rust_eh_register_frames () {}
58+
# #[no_mangle] pub extern fn rust_eh_unregister_frames () {}
5759
```
5860

5961
Note the use of `abort`: the `exchange_malloc` lang item is assumed to

src/doc/trpl/no-stdlib.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ fn start(_argc: isize, _argv: *const *const u8) -> isize {
3434
#[lang = "eh_personality"] extern fn eh_personality() {}
3535
#[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} }
3636
# #[lang = "eh_unwind_resume"] extern fn rust_eh_unwind_resume() {}
37+
# #[no_mangle] pub extern fn rust_eh_register_frames () {}
38+
# #[no_mangle] pub extern fn rust_eh_unregister_frames () {}
3739
# // fn main() {} tricked you, rustdoc!
3840
```
3941

@@ -60,6 +62,8 @@ pub extern fn main(argc: i32, argv: *const *const u8) -> i32 {
6062
#[lang = "eh_personality"] extern fn eh_personality() {}
6163
#[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} }
6264
# #[lang = "eh_unwind_resume"] extern fn rust_eh_unwind_resume() {}
65+
# #[no_mangle] pub extern fn rust_eh_register_frames () {}
66+
# #[no_mangle] pub extern fn rust_eh_unregister_frames () {}
6367
# // fn main() {} tricked you, rustdoc!
6468
```
6569

@@ -145,8 +149,10 @@ extern fn panic_fmt(args: &core::fmt::Arguments,
145149
}
146150

147151
#[lang = "eh_personality"] extern fn eh_personality() {}
148-
# #[lang = "eh_unwind_resume"] extern fn rust_eh_unwind_resume() {}
149152
# #[start] fn start(argc: isize, argv: *const *const u8) -> isize { 0 }
153+
# #[lang = "eh_unwind_resume"] extern fn rust_eh_unwind_resume() {}
154+
# #[no_mangle] pub extern fn rust_eh_register_frames () {}
155+
# #[no_mangle] pub extern fn rust_eh_unregister_frames () {}
150156
# fn main() {}
151157
```
152158

src/test/run-make/no-duplicate-libs/bar.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ pub extern fn bar() {}
2020
#[lang = "eh_personality"] fn eh_personality() {}
2121
#[lang = "eh_unwind_resume"] fn eh_unwind_resume() {}
2222
#[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} }
23+
#[no_mangle] pub extern fn rust_eh_register_frames () {}
24+
#[no_mangle] pub extern fn rust_eh_unregister_frames () {}

src/test/run-make/no-duplicate-libs/foo.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ pub extern fn foo() {}
2020
#[lang = "eh_personality"] fn eh_personality() {}
2121
#[lang = "eh_unwind_resume"] fn eh_unwind_resume() {}
2222
#[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} }
23-
23+
#[no_mangle] pub extern fn rust_eh_register_frames () {}
24+
#[no_mangle] pub extern fn rust_eh_unregister_frames () {}

src/test/run-pass/smallest-hello-world.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ extern "rust-intrinsic" { fn transmute<T, U>(t: T) -> U; }
2323
#[lang = "eh_personality"] extern fn eh_personality() {}
2424
#[lang = "eh_unwind_resume"] extern fn eh_unwind_resume() {}
2525
#[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} }
26+
#[no_mangle] pub extern fn rust_eh_register_frames () {}
27+
#[no_mangle] pub extern fn rust_eh_unregister_frames () {}
2628

2729
#[start]
2830
fn main(_: isize, _: *const *const u8) -> isize {

0 commit comments

Comments
 (0)