auto merge of #17187 : damag/rust/ffi-guide-fixes, r=alexcrichton

Updates the callbacks section to refer to the right function name and fixes a couple of minor whitespace issues in the examples.
This commit is contained in:
bors 2014-09-13 13:50:57 +00:00
commit 079951ed2a
1 changed files with 3 additions and 3 deletions

View File

@ -209,7 +209,7 @@ A basic example is:
Rust code:
~~~~no_run
extern fn callback(a:i32) {
extern fn callback(a: i32) {
println!("I'm called from C with value {0}", a);
}
@ -243,7 +243,7 @@ void trigger_callback() {
}
~~~~
In this example Rust's `main()` will call `do_callback()` in C,
In this example Rust's `main()` will call `trigger_callback()` in C,
which would, in turn, call back to `callback()` in Rust.
@ -269,7 +269,7 @@ struct RustObject {
// other members
}
extern "C" fn callback(target: *mut RustObject, a:i32) {
extern "C" fn callback(target: *mut RustObject, a: i32) {
println!("I'm called from C with value {0}", a);
unsafe {
// Update the value in RustObject with the value received from the callback