Skip to content

Commit f864fa8

Browse files
committed
Addressing style errors
1 parent 184fc64 commit f864fa8

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/concurrency.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ r[concurrency]
22
# Concurrency
33

44
r[concurrency.intro]
5-
Rust provides language and library features for writing concurrent programs. These features are designed to prevent [data races] situations in which multiple threads access the same memory without proper synchronization, with at least one of the accesses modifying that memory.
5+
Rust provides language and library features for writing concurrent programs. These features are designed to prevent [data races] --- situations in which multiple threads access the same memory without proper synchronization, with at least one of the accesses modifying that memory.
66

77
This chapter describes the traits, types, and concepts that Rust uses to express and enforce safe concurrency.
88

@@ -21,7 +21,7 @@ r[concurrency.send-and-sync.send]
2121
### Send
2222

2323
r[concurrency.send-and-sync.send.intro]
24-
The [`Send`] trait indicates that ownership of values of a type can be safely transferred between threads.
24+
The [`Send`] trait indicates that ownership of values of a type can be safely transferred between threads.
2525

2626
r[concurrency.send-and-sync.send.rules]
2727
1. A type that implements [`Send`] can be moved to another thread and used there without causing data races or other [undefined behavior].
@@ -35,8 +35,6 @@ r[concurrency.send-and-sync.send.negative-implementation]
3535
Types that manage non-thread-safe resources (such as raw pointers or unsynchronized interior mutability) may explicitly opt out of [`Send`] by providing a negative implementation (`!Send`).
3636

3737
```rust
38-
#![feature(negative_impls)]
39-
4038
struct SpecialThreadToken(u8);
4139

4240
impl !Send for SpecialThreadToken {}

src/glossary.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ affect locality.
147147

148148
### Marker trait
149149
A trait that has no associated items (no methods, no associated types, and no constants)
150-
and is used only to mark that a type has a particular property.
151-
Implementing a marker trait does not change a type’s behavior at runtime;
152-
it simply communicates to the compiler and to other code that the type satisfies some condition.
150+
and is used only to mark that a type has a particular property.
151+
Implementing a marker trait does not change a type’s behavior at runtime;
152+
it simply communicates to the compiler and to other code that the type satisfies some condition.
153153

154154
### Module
155155

0 commit comments

Comments
 (0)