auto merge of #9798 : mtwilliams/rust/master, r=brson

I also removed superfluous trailing whitespace.

I don't think I need to run the test suite.
This commit is contained in:
bors 2013-10-10 14:36:34 -07:00
commit 6aa5934e2b

View File

@ -261,7 +261,7 @@ check that one of the following conditions holds:
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