diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-21 15:23:10 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-04-21 15:23:10 -0700 |
| commit | 1ec7ccb53c4ef00eff1e13ff50ec18f54400de4a (patch) | |
| tree | 847c0e7558ea8963126f249a93b48a9b1f505c46 | |
| parent | d14fb2f0d6d6e6ccba713ed9605eb6c83a7d9c4f (diff) | |
| parent | 9cc0af8d695543c177ed2aef0a072e6c621c681d (diff) | |
| download | rust-1ec7ccb53c4ef00eff1e13ff50ec18f54400de4a.tar.gz rust-1ec7ccb53c4ef00eff1e13ff50ec18f54400de4a.zip | |
rollup merge of #24640: steveklabnik/new_unsafe_guide
https://github.com/rust-lang/rust/pull/24631 is related, as it will delete this from the TOC, but I want to keep it here.
| -rw-r--r-- | src/doc/trpl/SUMMARY.md | 1 | ||||
| -rw-r--r-- | src/doc/trpl/unsafe.md (renamed from src/doc/trpl/unsafe-code.md) | 4 | ||||
| -rw-r--r-- | src/librustc/diagnostics.rs | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/doc/trpl/SUMMARY.md b/src/doc/trpl/SUMMARY.md index a179f8fa55e..81a550b0f9a 100644 --- a/src/doc/trpl/SUMMARY.md +++ b/src/doc/trpl/SUMMARY.md @@ -55,6 +55,7 @@ * [Deref coercions](deref-coercions.md) * [Macros](macros.md) * [Raw Pointers](raw-pointers.md) + * [`unsafe`](unsafe.md) * [Nightly Rust](nightly-rust.md) * [Compiler Plugins](compiler-plugins.md) * [Inline Assembly](inline-assembly.md) diff --git a/src/doc/trpl/unsafe-code.md b/src/doc/trpl/unsafe.md index ab5e8ed16ad..7fe9a1fd27e 100644 --- a/src/doc/trpl/unsafe-code.md +++ b/src/doc/trpl/unsafe.md @@ -1,4 +1,4 @@ -% Unsafe Code +% Unsafe Rust’s main draw is its powerful static guarantees about behavior. But safety checks are conservative by nature: there are some programs that are actually @@ -76,7 +76,7 @@ behaviors that are certainly bad, but are expressly _not_ unsafe: * Integer overflow Rust cannot prevent all kinds of software problems. Buggy code can and will be -written in Rust. These things arne’t great, but they don’t qualify as `unsafe` +written in Rust. These things aren’t great, but they don’t qualify as `unsafe` specifically. # Unsafe Superpowers diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs index ba226c88e56..33ecc0ce205 100644 --- a/src/librustc/diagnostics.rs +++ b/src/librustc/diagnostics.rs @@ -208,7 +208,7 @@ fn main() { unsafe { f(); } } -See also http://doc.rust-lang.org/book/unsafe-code.html +See also http://doc.rust-lang.org/book/unsafe.html "##, E0152: r##" |