Skip to content

Rollup of 12 pull requests #32778

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 25 commits into from
Apr 6, 2016
Merged

Rollup of 12 pull requests #32778

merged 25 commits into from
Apr 6, 2016

Conversation

frewsxcv and others added 25 commits April 1, 2016 10:18
(1) `x` can be used in main() after the call to spawn(). Because the variables follow normal move semantics, though the keyword `move` is used, and i32 implements `Copy`.
(2) I remove this sentence because the previous sentence gives the referrence to `move closures`, and more description of `move` may be redundant.
No more lifetimes in function types after
rust-lang@f945190
Conflicts:
	src/doc/book/concurrency.md
1. In the English/Japanese phrases example in the "Multiple File
Crates" section of the "Crates and Modules" chapter, there are a total
of 8 module files that Rust looks for, while only four were
listed. This commit lists all 8 explicitly.
2. Title case fix.
This was the original intention :(
doc: there is no case that is shown, so something was likely missing …

…from the change
…abnik

Mention that it's not actually a data race

The example can't cause a data race since different indices are accesed.

(perhaps we should use an example where i iterates twice?)

r? @steveklabnik
Minor doc fixes in "Crates and Modules" and "Lifetimes" chapters

These commits fix a couple of (minor) issues in the _Crates and Modules_ and the _Lifetimes_ chapters of the book.

r? @steveklabnik
…lexcrichton

Address FIXMEs related to short lifetimes in `HashMap`.

None
Remove error description of `move`

(1) `x` can be used in main() after the call to spawn(). Because the variables follow normal move semantics, though the keyword `move` is used, and i32 implements `Copy`.
(2) I remove this sentence because the previous sentence gives the referrence to `move closures`, and more description of `move` may be redundant.
Indicate `None` is code-like in doc comment.
Remove outdated comment

The corresponding code was removed in rust-lang#31824. Also remove code duplication and rename the function.
minor: update old comments

No more lifetimes in function types after rust-lang@f945190
avoid "==" in assert! when one of the values is a bool

Is suspect this is something of an idiom
…ng-cycle, r=eddyb

change constant patterns to have a warning cycle

This was the original intention :(

r? @eddyb
Add `Copy` to the traits that are automatically implemented for tuples
@steveklabnik
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Apr 6, 2016

📌 Commit 862ae9a has been approved by steveklabnik

@rust-highfive
Copy link
Contributor

r? @Manishearth

(rust_highfive has picked a reviewer for you, use r? to override)

@bors
Copy link
Collaborator

bors commented Apr 6, 2016

⌛ Testing commit 862ae9a with merge 028c680...

@alexcrichton
Copy link
Member

@bors: retry force clean

@bors
Copy link
Collaborator

bors commented Apr 6, 2016

⌛ Testing commit 862ae9a with merge bf5da36...

bors added a commit that referenced this pull request Apr 6, 2016
Rollup of 12 pull requests

- Successful merges: #31762, #32538, #32634, #32668, #32679, #32691, #32724, #32727, #32744, #32761, #32766, #32774
- Failed merges:
@bors bors merged commit 862ae9a into rust-lang:master Apr 6, 2016
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.