diff options
| author | bors <bors@rust-lang.org> | 2014-08-24 11:16:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-24 11:16:02 +0000 |
| commit | 5ad7afc2d7e2671000f41a19bed73fef82475e47 (patch) | |
| tree | 0be0326b55bd8353ff23c3d60acbca2acefb319a | |
| parent | 471862f40cbb30657640603a252f142122743498 (diff) | |
| parent | 3e94401a6411001c7495a13dcbb289cb3935994f (diff) | |
| download | rust-5ad7afc2d7e2671000f41a19bed73fef82475e47.tar.gz rust-5ad7afc2d7e2671000f41a19bed73fef82475e47.zip | |
auto merge of #16717 : tshepang/rust/misplaced-comma, r=pcwalton
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.
| -rw-r--r-- | src/doc/guide.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/guide.md b/src/doc/guide.md index f1211c0788e..fad1dd31e68 100644 --- a/src/doc/guide.md +++ b/src/doc/guide.md @@ -5531,9 +5531,9 @@ There are two circumstances where Rust's safety provisions don't work well. The first is when interfacing with C code, and the second is when building certain kinds of abstractions. -Rust has support for FFI, (which you can read about in the [FFI -Guide](guide-ffi.html)) but Rust can't guarantee that the C code will be safe, -like Rust's will. Therefore, Rust marks such functions with the `unsafe` +Rust has support for FFI (which you can read about in the [FFI +Guide](guide-ffi.html)), but can't guarantee that the C code will be safe. +Therefore, Rust marks such functions with the `unsafe` keyword, which indicates that the function may not behave properly. Second, if you'd like to create some sort of shared-memory data structure, Rust |