Skip to content

Commit 1659d65

Browse files
committed
Auto merge of #38782 - clarcharr:stupid, r=GuillaumeGomez
Reword 'stupid' and 'crazy' in docs. These terms are not very descriptive and are better reworded as something else.
2 parents d3a2efa + 8ffc3e7 commit 1659d65

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1568,7 +1568,7 @@ do
15681568
then
15691569
LLVM_BUILD_DIR=${CFG_BUILD_DIR}$t/llvm
15701570
LLVM_INST_DIR=$LLVM_BUILD_DIR
1571-
# For some crazy reason the MSVC output dir is different than Unix
1571+
# For some weird reason the MSVC output dir is different than Unix
15721572
if [ ${is_msvc} -ne 0 ]; then
15731573
if [ -n "$CFG_DISABLE_OPTIMIZE_LLVM" ]
15741574
then

src/doc/nomicon/atomics.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ exactly what we said but, you know, fast. Wouldn't that be great?
2424

2525
# Compiler Reordering
2626

27-
Compilers fundamentally want to be able to do all sorts of crazy transformations
28-
to reduce data dependencies and eliminate dead code. In particular, they may
29-
radically change the actual order of events, or make events never occur! If we
30-
write something like
27+
Compilers fundamentally want to be able to do all sorts of complicated
28+
transformations to reduce data dependencies and eliminate dead code. In
29+
particular, they may radically change the actual order of events, or make events
30+
never occur! If we write something like
3131

3232
```rust,ignore
3333
x = 1;

src/doc/nomicon/meet-safe-and-unsafe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Well, Rust *has* a safe programming language. Let's step back a bit.
2222
Rust can be thought of as being composed of two programming languages: *Safe
2323
Rust* and *Unsafe Rust*. Safe Rust is For Reals Totally Safe. Unsafe Rust,
2424
unsurprisingly, is *not* For Reals Totally Safe. In fact, Unsafe Rust lets you
25-
do some really crazy unsafe things.
25+
do some really, *really* unsafe things.
2626

2727
Safe Rust is the *true* Rust programming language. If all you do is write Safe
2828
Rust, you will never have to worry about type-safety or memory-safety. You will

src/doc/nomicon/races.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ prevent *all* race conditions would be pretty awful to use, if not just
2121
incorrect.
2222

2323
So it's perfectly "fine" for a Safe Rust program to get deadlocked or do
24-
something incredibly stupid with incorrect synchronization. Obviously such a
25-
program isn't very good, but Rust can only hold your hand so far. Still, a
26-
race condition can't violate memory safety in a Rust program on
27-
its own. Only in conjunction with some other unsafe code can a race condition
28-
actually violate memory safety. For instance:
24+
something nonsensical with incorrect synchronization. Obviously such a program
25+
isn't very good, but Rust can only hold your hand so far. Still, a race
26+
condition can't violate memory safety in a Rust program on its own. Only in
27+
conjunction with some other unsafe code can a race condition actually violate
28+
memory safety. For instance:
2929

3030
```rust,no_run
3131
use std::thread;

src/libstd/sys/windows/thread_local.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ unsafe fn unregister_dtor(key: Key) -> bool {
207207
// loop to basically match Unix semantics. If we don't reach a fixed point
208208
// after a short while then we just inevitably leak something most likely.
209209
//
210-
// # The article mentions crazy stuff about "/INCLUDE"?
210+
// # The article mentions weird stuff about "/INCLUDE"?
211211
//
212212
// It sure does! Specifically we're talking about this quote:
213213
//

0 commit comments

Comments
 (0)