Rollup of 4 pull requests #41294
Merged
Rollup of 4 pull requests #41294
Conversation
This file contains 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
Member
frewsxcv
commented
Apr 14, 2017
frewsxcv
commented
- Successful merges: rustc_typeck: consolidate adjustment composition #41279, bump book repos #41281, Miscellneous refactorings of trans #41287, Avoid to use floating point match #41292
- Failed merges:
The book and the reference have both had changes lately; this integrates them upstream.
No good reason for them to be in there.
These do some low-level munging on the LLVM data structures. Unclear that they need to operate as a "second pass" but leave it for now.
A number of things were using `crate_hash` that really ought to be using `crate_disambiguator` (e.g., to create the plugin symbol names). They have been updated. It is important to remove `LinkMeta` from `SharedCrateContext` since it contains a hash of the entire crate, and hence it will change whenever **anything** changes (which would then require rebuilding **everything**).
shared mutable state is bad
Its going to be forbidden, see issue 41255.
…ikomatsakis rustc_typeck: consolidate adjustment composition Instead of having `write_adjustment` overwrite the previous adjustment, have `apply_adjustment` compose a new adjustment on top of the previous one. This is important because `NeverToAny` adjustments can be present on expressions during coercion. Fixes rust-lang#41213. r? @nikomatsakis
…guillaumegomez bump book repos Not ready to merge yet; I'd like to see what tidy says.
…ns, r=eddyb Miscellneous refactorings of trans This doesn't achieve any particular goal yet, but it's a collection of refactorings with the common goal of turning `SharedCrateContext` etc into stuff that we can use with on-demand and actually expect to hash in a stable fashion for incremental. Not there yet, clearly. r? @eddyb cc @michaelwoerister
Avoid to use floating point match Its going to be forbidden, see issue rust-lang#41255.
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
@bors r+ p=10 |
|
📌 Commit c04ae0f has been approved by |
frewsxcv
added
S-waiting-on-bors
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Apr 14, 2017
Merged
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.