about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-06-27 14:18:47 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-06-27 14:18:47 +0530
commit6dd33b459b30b65a75f644a75169cb6a07e4df53 (patch)
tree8a38b50d17aa8f9da5ea658e7a6c58def1138b8b
parent0bf0ea3a521c520171d5ef44edc84e456ae499ce (diff)
parent9001da658ae020199b479f416b21eb71d0d48492 (diff)
Rollup merge of #26603 - Gankro:ref, r=steveklabnik
Quick poll of basically the entire core team says this is ok.
-rw-r--r--src/doc/reference.md3
-rw-r--r--src/doc/trpl/unsafe.md7
2 files changed, 2 insertions, 8 deletions
diff --git a/src/doc/reference.md b/src/doc/reference.md
index a3e13acccae..7e28651c6aa 100644
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -1047,11 +1047,8 @@ This is a list of behavior not considered *unsafe* in Rust terms, but that may
 be undesired.
 
 * Deadlocks
-* Reading data from private fields (`std::repr`)
 * Leaks of memory and other resources
 * Exiting without calling destructors
-* Sending signals
-* Accessing/modifying the file system
 * Integer overflow
   - Overflow is considered "unexpected" behavior and is always user-error,
     unless the `wrapping` primitives are used. In non-optimized builds, the compiler
diff --git a/src/doc/trpl/unsafe.md b/src/doc/trpl/unsafe.md
index fdb9c33a2b0..e8f1b829061 100644
--- a/src/doc/trpl/unsafe.md
+++ b/src/doc/trpl/unsafe.md
@@ -12,7 +12,7 @@ two contexts. The first one is to mark a function as unsafe:
 
 ```rust
 unsafe fn danger_will_robinson() {
-    // scary stuff 
+    // scary stuff
 }
 ```
 
@@ -68,11 +68,8 @@ Whew! That’s a bunch of stuff. It’s also important to notice all kinds of
 behaviors that are certainly bad, but are expressly _not_ unsafe:
 
 * Deadlocks
-* Reading data from private fields
-* Leaks due to reference count cycles
+* Leaks of memory or other resources
 * Exiting without calling destructors
-* Sending signals
-* Accessing/modifying the file system
 * Integer overflow
 
 Rust cannot prevent all kinds of software problems. Buggy code can and will be