Skip to content

Rollup of 8 pull requests - #77527

Merged
bors merged 17 commits into
rust-lang:masterfrom
jonas-schievink:rollup-szgq5he
Oct 4, 2020
Merged

Rollup of 8 pull requests#77527
bors merged 17 commits into
rust-lang:masterfrom
jonas-schievink:rollup-szgq5he

Conversation

@jonas-schievink

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

sharnoffand others added 17 commits September 22, 2020 19:34
… enum
This makes the code a lot easier to work with. It also makes it easier
to add new fields without updating each variant and `match`
individually.
- Name the `Kind` variant after `DocFragmentKind` from `collapse_docs`
- Remove unneeded impls
The destination propagation as currently implemented does not supersede
the NRVO, e.g., the destination propagation never applies if either
local has an address taken, while NRVO might.
Additionally, the issue with failing assertions had been already
resolved.
Continue running both optimizations at mir-opt-level >= 2.
Backports LLVM commit:
[APFloat] convert SNaN to QNaN in convert() and raise Invalid signal
llvm/llvm-project@149f5b5
SNaN to QNaN conversion also matches what my Intel x86_64 hardware does.
Fixes an issue where links in the one-line version of an item's docs
would be in Fira Sans, while the rest would be in a serifed font.
These target features have to be supported or at least emulated by
alternative codegen backends anyway as they are used by common crates.
By moving this list to cg_ssa, other codegen backends don't have to copy
this code.
Minor `hash_map` doc adjustments + item attribute orderings
This PR is really a couple visual changes glued together:
1. Some of the doc comments for items in `std::collections::hash_map` referenced the names of types without escaping their formatting (e.g. using "VacantEntry" instead of "`VacantEntry`") - the ones I could find were changed to the latter
2. The vast majority of pre-item attributes seem to place doc comments as the first attribute (instead of things like `#[feature(...)]`), so the few that had the other order were changed.
3. Also ordering related: the general trend seems to be that `#[feature]` attributes follow `#[inline]`, so I swapped the two lines in places where that ordering was reversed. This is primarily a change based on stylistic continuity and aesthetics - I'm not sure how important that actually is / should be.
I figured this would be pretty uncontroversial, but some of these might have been intentional for reasons I don't know about - if so, I'd be happy to remove the relevant changes. Of these, the final set of changes is probably the most unnecessary, so it also might be better to leave those out (in favor of reducing code churn).
Backport LLVM apfloat commit to rustc_apfloat
Backports LLVM commit: llvm/llvm-project@e34bd1eFixes#69532
BTreeMap: complete the compile-time test_variance test case
Some of the items added to the new `test_sync` belonged in the old `test_variance` as well. And fixed inconsistent paths to nearby modules.
r? @Mark-Simulacrum
Support vectors with fewer than 8 elements for simd_select_bitmask
Resolves the issue raised here: rust-lang/stdarch#310 (comment)
Change DocFragments from enum variant fields to structs with a nested enum
This makes the code a lot easier to work with. It also makes it easier
to add new fields without updating each variant and `match`
individually.
- Name the `Kind` variant after `DocFragmentKind` from `collapse_docs`
- Remove unneeded impls
Progress towards #77254.
r? @GuillaumeGomez
…llaumeGomez
Only use Fira Sans for the first `td` in item lists
Fixes#77516.
Fixes an issue where links in the one-line version of an item's docs
would be in Fira Sans, while the rest would be in a serifed font.
Move target feature whitelist from cg_llvm to cg_ssa
These target features have to be supported or at least emulated by alternative codegen backends anyway as they are used by common crates. By moving this list to cg_ssa, other codegen backends don't have to copy
this code.
Enable RenameReturnPlace MIR optimization on mir-opt-level >= 2
The destination propagation as currently implemented does not supersede the NRVO, e.g., the destination propagation never applies if either local has an address taken, while NRVO might.
Additionally, the issue with failing assertions had been already resolved.
Continue running both optimizations at mir-opt-level >= 2.
@jonas-schievink

Copy link
Copy Markdown
ContributorAuthor

@bors r+ rollup=never p=8

@rustbot modify labels: rollup

@bors

bors commented Oct 4, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit fa200ce has been approved by jonas-schievink

@rustbotrustbot added the rollup A PR which is a rollup label Oct 4, 2020
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 4, 2020
@bors

bors commented Oct 4, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit fa200ce with merge a835b48...

@bors

bors commented Oct 4, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: jonas-schievink
Pushing a835b48 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 4, 2020
@bors
bors merged commit a835b48 into rust-lang:masterOct 4, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 4, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

11 participants

@jonas-schievink@bors@rustbot@sharnoff@est31@Amanieu@ssomers@jyn514@tmiasko@camelid@bjorn3