Skip to content

Fixed typo under 'Segmented stacks and the linter'. #9798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2013
Merged

Fixed typo under 'Segmented stacks and the linter'. #9798

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions doc/tutorial-ffi.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ the true length after compression for setting the length.
~~~~ {.xfail-test}
pub fn compress(src: &[u8]) -> ~[u8] {
#[fixed_stack_segment]; #[inline(never)];

unsafe {
let srclen = src.len() as size_t;
let psrc = vec::raw::to_ptr(src);
Expand All @@ -157,7 +157,7 @@ format and `snappy_uncompressed_length` will retrieve the exact buffer size requ
~~~~ {.xfail-test}
pub fn uncompress(src: &[u8]) -> Option<~[u8]> {
#[fixed_stack_segment]; #[inline(never)];

unsafe {
let srclen = src.len() as size_t;
let psrc = vec::raw::to_ptr(src);
Expand Down Expand Up @@ -236,7 +236,7 @@ use std::libc::size_t;
unsafe fn snappy_max_compressed_length(source_length: size_t) -> size_t {
#[fixed_stack_segment]; #[inline(never)];
return snappy_max_compressed_length(source_length);

#[link_args = "-lsnappy"]
extern {
fn snappy_max_compressed_length(source_length: size_t) -> size_t;
Expand All @@ -259,9 +259,9 @@ check that one of the following conditions holds:
2. The call occurs inside of an `extern fn`;
3. The call occurs within a stack closure created by some other
safe fn.

All of these conditions ensure that you are running on a large stack
segmented. However, they are sometimes too strict. If your application
segment. However, they are sometimes too strict. If your application
will be making many calls into C, it is often beneficial to promote
the `#[fixed_stack_segment]` attribute higher up the call chain. For
example, the Rust compiler actually labels main itself as requiring a
Expand Down Expand Up @@ -298,7 +298,7 @@ impl<T: Send> Unique<T> {
pub fn new(value: T) -> Unique<T> {
#[fixed_stack_segment];
#[inline(never)];

unsafe {
let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;
assert!(!ptr::is_null(ptr));
Expand All @@ -324,7 +324,7 @@ impl<T: Send> Drop for Unique<T> {
fn drop(&mut self) {
#[fixed_stack_segment];
#[inline(never)];

unsafe {
let x = intrinsics::init(); // dummy value to swap in
// moving the object out is needed to call the destructor
Expand Down