diff options
| author | bors <bors@rust-lang.org> | 2015-06-27 14:53:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-27 14:53:15 +0000 |
| commit | 2ba46f8bbc6fdf10e434faea52b9ca20e0d9f2eb (patch) | |
| tree | c64523a6c190e5bc6399baf2dbef3f6048af1c07 | |
| parent | b36ae019468c36c995523d797446a372ab9d14e1 (diff) | |
| parent | 6dd33b459b30b65a75f644a75169cb6a07e4df53 (diff) | |
| download | rust-2ba46f8bbc6fdf10e434faea52b9ca20e0d9f2eb.tar.gz rust-2ba46f8bbc6fdf10e434faea52b9ca20e0d9f2eb.zip | |
Auto merge of #26616 - Manishearth:rollup, r=Manishearth
- Successful merges: #26565, #26584, #26596, #26603 - Failed merges:
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/doc/reference.md | 3 | ||||
| -rw-r--r-- | src/doc/trpl/unsafe.md | 7 | ||||
| -rw-r--r-- | src/libstd/macros.rs | 22 |
4 files changed, 3 insertions, 30 deletions
diff --git a/.gitignore b/.gitignore index 5d5da135a82..572111bf961 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ *.exe *.fn *.html +*.kdev4 *.ky *.ll *.llvm 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 diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 02c35e9526d..697b934c676 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -36,28 +36,6 @@ #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] #[allow_internal_unstable] -/// The entry point for panic of Rust threads. -/// -/// This macro is used to inject panic into a Rust thread, causing the thread to -/// unwind and panic entirely. Each thread's panic can be reaped as the -/// `Box<Any>` type, and the single-argument form of the `panic!` macro will be -/// the value which is transmitted. -/// -/// The multi-argument form of this macro panics with a string and has the -/// `format!` syntax for building a string. -/// -/// # Examples -/// -/// ```should_panic -/// # #![allow(unreachable_code)] -/// panic!(); -/// panic!("this is a terrible mistake!"); -/// panic!(4); // panic with the value of 4 to be collected elsewhere -/// panic!("this is a {} {message}", "fancy", message = "message"); -/// ``` -#[macro_export] -#[stable(feature = "rust1", since = "1.0.0")] -#[allow_internal_unstable] macro_rules! panic { () => ({ panic!("explicit panic") |
