Skip to content

Commit 7ab793e

Browse files
committed
Merge pull request #24814 from steveklabnik/doc_backport
Doc backport
2 parents 4c0ac0a + b43138b commit 7ab793e

File tree

22 files changed

+134
-695
lines changed

22 files changed

+134
-695
lines changed

src/doc/complement-design-faq.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Types which are [`Sync`][sync] are thread-safe when multiple shared
5656
references to them are used concurrently. Types which are not `Sync` are not
5757
thread-safe, and thus when used in a global require unsafe code to use.
5858

59-
[sync]: core/kinds/trait.Sync.html
59+
[sync]: core/marker/trait.Sync.html
6060

6161
### If mutable static items that implement `Sync` are safe, why is taking &mut SHARABLE unsafe?
6262

@@ -139,7 +139,7 @@ and explicitly calling the `clone` method. Making user-defined copy operators
139139
explicit surfaces the underlying complexity, forcing the developer to opt-in
140140
to potentially expensive operations.
141141

142-
[copy]: core/kinds/trait.Copy.html
142+
[copy]: core/marker/trait.Copy.html
143143
[clone]: core/clone/trait.Clone.html
144144

145145
## No move constructors
@@ -165,12 +165,13 @@ particularly easy to read.
165165

166166
## Why is `let` used to introduce variables?
167167

168-
We don't use the term "variable", instead, we use "variable bindings". The
169-
simplest way for binding is the `let` syntax, other ways including `if let`,
170-
`while let` and `match`. Bindings also exist in function arguments positions.
168+
Instead of the term "variable", we use "variable bindings". The
169+
simplest way for creating a binding is by using the `let` syntax.
170+
Other ways include `if let`, `while let`, and `match`. Bindings also
171+
exist in function argument positions.
171172

172173
Bindings always happen in pattern matching positions, and it's also Rust's way
173-
to declare mutability. One can also redeclare mutability of a binding in
174+
to declare mutability. One can also re-declare mutability of a binding in
174175
pattern matching. This is useful to avoid unnecessary `mut` annotations. An
175176
interesting historical note is that Rust comes, syntactically, most closely
176177
from ML, which also uses `let` to introduce bindings.

src/doc/complement-lang-faq.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ Let the fact that this is an easily countable number be a warning.
4242

4343
## Does it run on Windows?
4444

45-
Yes. All development happens in lockstep on all 3 target platforms (using MinGW, not Cygwin). Note that the Windows implementation currently has some limitations; in particular, the 64-bit build is [not fully supported yet][win64], and all executables created by rustc [depend on libgcc DLL at runtime][libgcc].
46-
47-
[win64]: https://github.com/rust-lang/rust/issues/1237
48-
[libgcc]: https://github.com/rust-lang/rust/issues/11782
45+
Yes. All development happens in lockstep on all 3 target platforms (using MinGW, not Cygwin).
4946

5047
## Is it OO? How do I do this thing I normally do in an OO language?
5148

0 commit comments

Comments
 (0)