Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3e94401

Browse files
committedAug 24, 2014
doc: move misplaced comma
Also: * Remove unseeming repetition. * By now, the reader has already heard that Rust is safe by default, so reduce the overlong sentence, making it easier to read.
1 parent 36131f5 commit 3e94401

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed
 

‎src/doc/guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5531,9 +5531,9 @@ There are two circumstances where Rust's safety provisions don't work well.
55315531
The first is when interfacing with C code, and the second is when building
55325532
certain kinds of abstractions.
55335533

5534-
Rust has support for FFI, (which you can read about in the [FFI
5535-
Guide](guide-ffi.html)) but Rust can't guarantee that the C code will be safe,
5536-
like Rust's will. Therefore, Rust marks such functions with the `unsafe`
5534+
Rust has support for FFI (which you can read about in the [FFI
5535+
Guide](guide-ffi.html)), but can't guarantee that the C code will be safe.
5536+
Therefore, Rust marks such functions with the `unsafe`
55375537
keyword, which indicates that the function may not behave properly.
55385538

55395539
Second, if you'd like to create some sort of shared-memory data structure, Rust

5 commit comments

Comments
 (5)

bors commented on Aug 24, 2014

@bors
Collaborator

saw approval from pcwalton
at tshepang@3e94401

bors commented on Aug 24, 2014

@bors
Collaborator

merging tshepang/rust/misplaced-comma = 3e94401 into auto

bors commented on Aug 24, 2014

@bors
Collaborator

tshepang/rust/misplaced-comma = 3e94401 merged ok, testing candidate = 5ad7afc

bors commented on Aug 24, 2014

@bors
Collaborator

fast-forwarding master to auto = 5ad7afc

Please sign in to comment.