Skip to content

Commit f862e12

Browse files
committedApr 12, 2014
doc: Un-ignore lots of guide-ffi tests
Using some strategically-placed `#` markers most of the examples are testable (and their contents are nontrivial). Closes #13445
1 parent ecc774f commit f862e12

File tree

1 file changed

+58
-23
lines changed

1 file changed

+58
-23
lines changed
 

‎src/doc/guide-ffi.md

+58-23
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@ snappy includes a C interface (documented in
1111
The following is a minimal example of calling a foreign function which will
1212
compile if snappy is installed:
1313

14-
~~~~ {.ignore}
14+
~~~~
1515
extern crate libc;
1616
use libc::size_t;
1717
1818
#[link(name = "snappy")]
19+
# #[cfg(ignore_this)]
1920
extern {
2021
fn snappy_max_compressed_length(source_length: size_t) -> size_t;
2122
}
23+
# unsafe fn snappy_max_compressed_length(a: size_t) -> size_t { a }
2224
2325
fn main() {
2426
let x = unsafe { snappy_max_compressed_length(100) };
@@ -78,7 +80,11 @@ vectors as pointers to memory. Rust's vectors are guaranteed to be a contiguous
7880
length is number of elements currently contained, and the capacity is the total size in elements of
7981
the allocated memory. The length is less than or equal to the capacity.
8082

81-
~~~~ {.ignore}
83+
~~~~
84+
# extern crate libc;
85+
# use libc::{c_int, size_t};
86+
# unsafe fn snappy_validate_compressed_buffer(_: *u8, _: size_t) -> c_int { 0 }
87+
# fn main() {}
8288
pub fn validate_compressed_buffer(src: &[u8]) -> bool {
8389
unsafe {
8490
snappy_validate_compressed_buffer(src.as_ptr(), src.len() as size_t) == 0
@@ -98,14 +104,20 @@ required capacity to hold the compressed output. The vector can then be passed t
98104
`snappy_compress` function as an output parameter. An output parameter is also passed to retrieve
99105
the true length after compression for setting the length.
100106

101-
~~~~ {.ignore}
102-
pub fn compress(src: &[u8]) -> ~[u8] {
107+
~~~~
108+
# extern crate libc;
109+
# use libc::{size_t, c_int};
110+
# unsafe fn snappy_compress(a: *u8, b: size_t, c: *mut u8,
111+
# d: *mut size_t) -> c_int { 0 }
112+
# unsafe fn snappy_max_compressed_length(a: size_t) -> size_t { a }
113+
# fn main() {}
114+
pub fn compress(src: &[u8]) -> Vec<u8> {
103115
unsafe {
104116
let srclen = src.len() as size_t;
105117
let psrc = src.as_ptr();
106118
107119
let mut dstlen = snappy_max_compressed_length(srclen);
108-
let mut dst = slice::with_capacity(dstlen as uint);
120+
let mut dst = Vec::with_capacity(dstlen as uint);
109121
let pdst = dst.as_mut_ptr();
110122
111123
snappy_compress(psrc, srclen, pdst, &mut dstlen);
@@ -118,16 +130,26 @@ pub fn compress(src: &[u8]) -> ~[u8] {
118130
Decompression is similar, because snappy stores the uncompressed size as part of the compression
119131
format and `snappy_uncompressed_length` will retrieve the exact buffer size required.
120132

121-
~~~~ {.ignore}
122-
pub fn uncompress(src: &[u8]) -> Option<~[u8]> {
133+
~~~~
134+
# extern crate libc;
135+
# use libc::{size_t, c_int};
136+
# unsafe fn snappy_uncompress(compressed: *u8,
137+
# compressed_length: size_t,
138+
# uncompressed: *mut u8,
139+
# uncompressed_length: *mut size_t) -> c_int { 0 }
140+
# unsafe fn snappy_uncompressed_length(compressed: *u8,
141+
# compressed_length: size_t,
142+
# result: *mut size_t) -> c_int { 0 }
143+
# fn main() {}
144+
pub fn uncompress(src: &[u8]) -> Option<Vec<u8>> {
123145
unsafe {
124146
let srclen = src.len() as size_t;
125147
let psrc = src.as_ptr();
126148
127149
let mut dstlen: size_t = 0;
128150
snappy_uncompressed_length(psrc, srclen, &mut dstlen);
129151
130-
let mut dst = slice::with_capacity(dstlen as uint);
152+
let mut dst = Vec::with_capacity(dstlen as uint);
131153
let pdst = dst.as_mut_ptr();
132154
133155
if snappy_uncompress(psrc, srclen, pdst, &mut dstlen) == 0 {
@@ -187,16 +209,19 @@ A basic example is:
187209

188210
Rust code:
189211

190-
~~~~ {.ignore}
212+
~~~~
191213
extern fn callback(a:i32) {
192214
println!("I'm called from C with value {0}", a);
193215
}
194216
195217
#[link(name = "extlib")]
218+
# #[cfg(ignore)]
196219
extern {
197-
fn register_callback(cb: extern "C" fn(i32)) -> i32;
220+
fn register_callback(cb: extern fn(i32)) -> i32;
198221
fn trigger_callback();
199222
}
223+
# unsafe fn register_callback(cb: extern fn(i32)) -> i32 { 0 }
224+
# unsafe fn trigger_callback() { }
200225
201226
fn main() {
202227
unsafe {
@@ -240,33 +265,39 @@ referenced Rust object.
240265

241266
Rust code:
242267

243-
~~~~ {.ignore}
268+
~~~~
244269
245270
struct RustObject {
246271
a: i32,
247272
// other members
248273
}
249274
250-
extern fn callback(target: *RustObject, a:i32) {
275+
extern fn callback(target: *mut RustObject, a:i32) {
251276
println!("I'm called from C with value {0}", a);
252-
(*target).a = a; // Update the value in RustObject with the value received from the callback
277+
unsafe {
278+
// Update the value in RustObject with the value received from the callback
279+
(*target).a = a;
280+
}
253281
}
254282
255283
#[link(name = "extlib")]
284+
# #[cfg(ignore)]
256285
extern {
257-
fn register_callback(target: *RustObject, cb: extern "C" fn(*RustObject, i32)) -> i32;
286+
fn register_callback(target: *mut RustObject,
287+
cb: extern fn(*mut RustObject, i32)) -> i32;
258288
fn trigger_callback();
259289
}
290+
# unsafe fn register_callback(a: *mut RustObject,
291+
# b: extern fn(*mut RustObject, i32)) -> i32 { 0 }
292+
# unsafe fn trigger_callback() {}
260293
261294
fn main() {
262295
// Create the object that will be referenced in the callback
263-
let rust_object = ~RustObject{a: 5, ...};
296+
let mut rust_object = ~RustObject{ a: 5 };
264297
265298
unsafe {
266-
// Gets a raw pointer to the object
267-
let target_addr:*RustObject = ptr::to_unsafe_ptr(rust_object);
268-
register_callback(target_addr, callback);
269-
trigger_callback(); // Triggers the callback
299+
register_callback(&mut *rust_object, callback);
300+
trigger_callback();
270301
}
271302
}
272303
~~~~
@@ -403,13 +434,15 @@ Foreign APIs often export a global variable which could do something like track
403434
global state. In order to access these variables, you declare them in `extern`
404435
blocks with the `static` keyword:
405436

406-
~~~{.ignore}
437+
~~~
407438
extern crate libc;
408439
409440
#[link(name = "readline")]
441+
# #[cfg(ignore)]
410442
extern {
411443
static rl_readline_version: libc::c_int;
412444
}
445+
# static rl_readline_version: libc::c_int = 0;
413446
414447
fn main() {
415448
println!("You have readline version {} installed.",
@@ -421,21 +454,23 @@ Alternatively, you may need to alter global state provided by a foreign
421454
interface. To do this, statics can be declared with `mut` so rust can mutate
422455
them.
423456

424-
~~~{.ignore}
457+
~~~
425458
extern crate libc;
426459
use std::ptr;
427460
428461
#[link(name = "readline")]
462+
# #[cfg(ignore)]
429463
extern {
430464
static mut rl_prompt: *libc::c_char;
431465
}
466+
# static mut rl_prompt: *libc::c_char = 0 as *libc::c_char;
432467
433468
fn main() {
434-
do "[my-awesome-shell] $".as_c_str |buf| {
469+
"[my-awesome-shell] $".with_c_str(|buf| {
435470
unsafe { rl_prompt = buf; }
436471
// get a line, process it
437472
unsafe { rl_prompt = ptr::null(); }
438-
}
473+
});
439474
}
440475
~~~
441476

0 commit comments

Comments
 (0)