Rollup of 14 pull requests #46922
Merged
Rollup of 14 pull requests #46922
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
kennytm
commented
Dec 21, 2017
•
kennytm
commented
- Successful merges: Replace libtest/lib.rs:FnBox with std::boxed::FnBox. #46636, Fix ICE when calling non-functions within closures #46780, Cleanup for libgraphviz #46784, rustc: do not raise the alignment of optimized enums to the niche's alignment. #46809, Prevent rustc overwriting input files #46814, libcore/num/mod.rs: simplify the int_impl! macro. #46820, incr.comp.: Precompute small hash for filenames to save some work. #46839, Escape more items in the sidebar when needed #46847, tweaks and fixes for doc(include) #46858, Update compiler_builtins #46878, Clarify vec docs on deallocation (fixes #46879) #46884, A few small improvements to the contributing docs #46890, docs: do not call integer overflows as underflows #46898, rustc: Sort CGUs before merging #46918
- Failed merges:
If rustc is invoked on a file that would be overwritten by the compilation, the compilation now fails, to avoid accidental loss. This resolves rust-lang#13019.
The visitor for walking function bodies did not previously properly handle error-cases for function calls. These are now ignored, preventing the panic.
We can simply use generic intrinsics since cd1848a Also, minimize unsafe blocks. Signed-off-by: NODA, Kai <nodakai@gmail.com>
This commit fixes some nondeterminism in compilation when using multiple codegen units. The algorithm for splitting codegen units currently takes the otherwise-would-be-for-incremental partitioning and then continuously merges the two smallest codegen units until the desired number of codegen units are reached. We want to be sure to merge the same codegen units each time a compilation is run but there's some subtle reorderings amongst all the items which was causing this step to be slightly buggy. Notably this step involves sorting codegen units by size, but if two codegen units had the same size they would appear in different locations in the list each time. This commit fixes this issue by sorting codegen units by name before doing the loop to merge the two smallest. This means that we've got a deterministic order going in and since we're using a stable sort this should mean that we're always now getting a deterministic merging of codegen units. Closes rust-lang#46846
Replace libtest/lib.rs:FnBox with std::boxed::FnBox. Fixes rust-lang#41810.
Fix ICE when calling non-functions within closures The visitor for walking function bodies did not previously properly handle error-cases for function calls. These are now ignored, preventing the panic. This fixes rust-lang#46771.
Cleanup for libgraphviz
rustc: do not raise the alignment of optimized enums to the niche's alignment. This is the improved fix for rust-lang#46769 that does not increase the size of any types (see also rust-lang#46808).
Prevent rustc overwriting input files If rustc is invoked on a file that would be overwritten by the compilation, the compilation now fails, to avoid accidental loss. This resolves rust-lang#13019. Kudos to @estebank, whose patch I finished off.
…ichton libcore/num/mod.rs: simplify the int_impl! macro. We can simply use generic intrinsics since cd1848a by @alexcrichton Also, minimize unsafe blocks.
… r=QuietMisdreavus Escape more items in the sidebar when needed Fixes rust-lang#46724. r? @QuietMisdreavus
… r=estebank tweaks and fixes for doc(include) This PR makes a handful of changes around `#[doc(include="file.md")]` (rust-lang#44732): * Turns errors when loading files into full errors. This matches the original RFC text. * Makes the `missing_docs` lint check for `#[doc(include="file.md")]` as well as regular `#[doc="text"]` attributes. * Loads files included by `#[doc(include="file.md")]` into dep-info, mirroring the behavior of `include_str!()` and friends. * Adds or modifies tests to check for all of these.
Update compiler_builtins Fixes rust-lang#46822 (See rust-lang/compiler-builtins#218)
Clarify vec docs on deallocation (fixes rust-lang#46879) r? @steveklabnik
…r=steveklabnik A few small improvements to the contributing docs r? @steveklabnik
…, r=steveklabnik docs: do not call integer overflows as underflows In the API docs, integer overflow is sometimes called underflow. Underflow is really when the magnitude of a floating-point number is too small so the number underflows to subnormal or zero. With integers it is always overflow, even if the expected result is less than the minimum number that can be represented.
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=15 |
|
📌 Commit ed19a8c has been approved by |
kennytm
added
the
S-waiting-on-bors
|
⌛ Testing commit ed19a8c1c911c047ab21287c19753a3f565633be with merge 1f6d130e9c607899ddcc0eec47899bd99eb94732... |
|
💔 Test failed - status-travis |
…lwoerister rustc: Sort CGUs before merging This commit fixes some nondeterminism in compilation when using multiple codegen units. The algorithm for splitting codegen units currently takes the otherwise-would-be-for-incremental partitioning and then continuously merges the two smallest codegen units until the desired number of codegen units are reached. We want to be sure to merge the same codegen units each time a compilation is run but there's some subtle reorderings amongst all the items which was causing this step to be slightly buggy. Notably this step involves sorting codegen units by size, but if two codegen units had the same size they would appear in different locations in the list each time. This commit fixes this issue by sorting codegen units by name before doing the loop to merge the two smallest. This means that we've got a deterministic order going in and since we're using a stable sort this should mean that we're always now getting a deterministic merging of codegen units. Closes rust-lang#46846
|
📌 Commit 0787ad9 has been approved by |
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Dec 22, 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.