Skip to content

Commit

Permalink
Merge branch 'master' into handle-drop-zst
Browse files Browse the repository at this point in the history
  • Loading branch information
pwbh authored Nov 21, 2024
2 parents 510aeeb + 0674321 commit 18c8a83
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/races.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Safe Rust guarantees an absence of data races, which are defined as:
* one or more of them is unsynchronized

A data race has Undefined Behavior, and is therefore impossible to perform in
Safe Rust. Data races are *mostly* prevented through Rust's ownership system:
Safe Rust. Data races are prevented *mostly* through Rust's ownership system alone:
it's impossible to alias a mutable reference, so it's impossible to perform a
data race. Interior mutability makes this more complicated, which is largely why
we have the Send and Sync traits (see the next section for more on this).
Expand Down
2 changes: 1 addition & 1 deletion src/what-unsafe-does.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ language cares about is preventing the following things:
[`NonNull`] that is null. (Requesting custom invalid values is an unstable
feature, but some stable libstd types, like `NonNull`, make use of it.)

For a more detailed explanation about "Undefined Bahavior", you may refer to
For a more detailed explanation about "Undefined Behavior", you may refer to
[the reference][behavior-considered-undefined].

"Producing" a value happens any time a value is assigned, passed to a
Expand Down

0 comments on commit 18c8a83

Please sign in to comment.