Rollup of 7 pull requests #32561
Merged
Rollup of 7 pull requests #32561
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `println!` calls in the previous version were never shown (at least not in the playpen) because the main thread is finished before all the spawned child threads were synchronized. This commit adds a join for each thread handle to wait in the main thread until all child threads are finished.
(1) In contrast to `that`, `so that` expresses `result` indicated by the sentence, not `reason`; (2) `block` is an expression, and may be have an expression, so I add `optional an expression` to make more precise; (3) When I read here, I was confused with what `the child` referred to. After modification, it would be better.
…es, r=steveklabnik first round of removal of integer suffixes
Remove trailing whitespace at the end of lines According the rules of styling Rust code there should not be trailing whitespace at the end of lines or files. I thought that it might be good to remove trailing whitespace from other files also, if it does not break anything.
Add an example for E0034 r? @steveklabnik cc @mbrubeck
Docs: a tiny modification
Fix missing console output in `Barrier` example The `println!` calls in the previous version were never shown (at least not in the playpen) because the main thread is finished before all the spawned child threads were synchronized. This commit adds a join for each thread handle to wait in the main thread until all child threads are finished. r? @steveklabnik
docs: make some text changes on Section `Macros` (1) In contrast to `that`, `so that` expresses `result` indicated by the sentence, not `reason`; (2) `block` is an expression, and may be have an expression, so I add `optionally an expression` to make more precise; ~~(3) When I read here, I was confused with what `the child` referred to. After modification, it would be better.~~
Getting Started: "copy" -> "move"
|
r? @nrc (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
|
📌 Commit 9eea1d7 has been approved by |
bors
added a commit
that referenced
this pull request
Mar 28, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Barrierexample #32507, docs: make some text changes on SectionMacros#32509, Getting Started: "copy" -> "move" #32534