Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Rollup of 12 pull requests #32772

Closed
wants to merge 25 commits into from
Closed

Conversation

Amanieu and others added 25 commits March 31, 2016 15:53
(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
…assert, r=eddyb

Fix LLVM assert when handling bad intrinsic monomorphizations

Passing an invalid type to certain intrinsics would trigger an LLVM assert even though the invalid type was caught by the compiler.

r? @eddyb
…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
@steveklabnik
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Apr 6, 2016

📌 Commit 1e4a0d0 has been approved by steveklabnik

@rust-highfive
Copy link
Collaborator

r? @Manishearth

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

@bors
Copy link
Contributor

bors commented Apr 6, 2016

⌛ Testing commit 1e4a0d0 with merge 50db636...

@bors
Copy link
Contributor

bors commented Apr 6, 2016

💔 Test failed - auto-win-msvc-64-opt-mir

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.