Skip to content

Commit 2ba46f8

Browse files
committed
Auto merge of #26616 - Manishearth:rollup, r=Manishearth
- Successful merges: #26565, #26584, #26596, #26603 - Failed merges:
2 parents b36ae01 + 6dd33b4 commit 2ba46f8

File tree

4 files changed

+3
-30
lines changed

4 files changed

+3
-30
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*.exe
2020
*.fn
2121
*.html
22+
*.kdev4
2223
*.ky
2324
*.ll
2425
*.llvm

Diff for: src/doc/reference.md

-3
Original file line numberDiff line numberDiff line change
@@ -1047,11 +1047,8 @@ This is a list of behavior not considered *unsafe* in Rust terms, but that may
10471047
be undesired.
10481048

10491049
* Deadlocks
1050-
* Reading data from private fields (`std::repr`)
10511050
* Leaks of memory and other resources
10521051
* Exiting without calling destructors
1053-
* Sending signals
1054-
* Accessing/modifying the file system
10551052
* Integer overflow
10561053
- Overflow is considered "unexpected" behavior and is always user-error,
10571054
unless the `wrapping` primitives are used. In non-optimized builds, the compiler

Diff for: src/doc/trpl/unsafe.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ two contexts. The first one is to mark a function as unsafe:
1212

1313
```rust
1414
unsafe fn danger_will_robinson() {
15-
// scary stuff
15+
// scary stuff
1616
}
1717
```
1818

@@ -68,11 +68,8 @@ Whew! That’s a bunch of stuff. It’s also important to notice all kinds of
6868
behaviors that are certainly bad, but are expressly _not_ unsafe:
6969

7070
* Deadlocks
71-
* Reading data from private fields
72-
* Leaks due to reference count cycles
71+
* Leaks of memory or other resources
7372
* Exiting without calling destructors
74-
* Sending signals
75-
* Accessing/modifying the file system
7673
* Integer overflow
7774

7875
Rust cannot prevent all kinds of software problems. Buggy code can and will be

Diff for: src/libstd/macros.rs

-22
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,6 @@
1414
//! library. Each macro is available for use when linking against the standard
1515
//! library.
1616
17-
/// The entry point for panic of Rust threads.
18-
///
19-
/// This macro is used to inject panic into a Rust thread, causing the thread to
20-
/// unwind and panic entirely. Each thread's panic can be reaped as the
21-
/// `Box<Any>` type, and the single-argument form of the `panic!` macro will be
22-
/// the value which is transmitted.
23-
///
24-
/// The multi-argument form of this macro panics with a string and has the
25-
/// `format!` syntax for building a string.
26-
///
27-
/// # Examples
28-
///
29-
/// ```should_panic
30-
/// # #![allow(unreachable_code)]
31-
/// panic!();
32-
/// panic!("this is a terrible mistake!");
33-
/// panic!(4); // panic with the value of 4 to be collected elsewhere
34-
/// panic!("this is a {} {message}", "fancy", message = "message");
35-
/// ```
36-
#[macro_export]
37-
#[stable(feature = "rust1", since = "1.0.0")]
38-
#[allow_internal_unstable]
3917
/// The entry point for panic of Rust threads.
4018
///
4119
/// This macro is used to inject panic into a Rust thread, causing the thread to

0 commit comments

Comments
 (0)