Skip to content

Rollup of 6 pull requests - #89683

Merged
bors merged 15 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-q2mjd9m
Oct 9, 2021
Merged

Rollup of 6 pull requests#89683
bors merged 15 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-q2mjd9m

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

notriddleand others added 15 commits October 4, 2021 16:53
It was marking them up as `<span class="op">=</span><span class="op">&gt;</span>`,
which is bloaty and wrong.
…, r=jackh726
Don't normalize xform_ret_ty during method candidate assembly
Fixesrust-lang#85671
Normalizing the return type of a method candidate together with the expected receiver type of the method can lead to valid method candidates being rejected during probing. Specifically in the example of the fixed issue we have a `self_ty` of the form `&A<&[Coef]>` whereas the `impl_ty` of the method would be `&A<_>`, if we normalize the projection in the return type we unify the inference variable with `Cont`, which will lead us to reject the candidate in the sup type check in `consider_probe`. Since we don't actually need the normalized return type during candidate assembly, we postpone the normalization until we consider candidates in `consider_probe`.
…, r=GuillaumeGomez
Make rustdoc not highlight `->` and `=>` as operators
It was marking them up as `<span class="op">=</span><span class="op">&gt;</span>`,
which is bloaty and wrong (at least, I think `<=` and `=>` should probably be different colors, since they're so different and yet made from the same symbols).
Before:
![image](https://user-images.githubusercontent.com/1593513/135939748-f49b0f9e-6a7d-4d65-935a-e31cdf688a81.png)
After:
![image](https://user-images.githubusercontent.com/1593513/135940063-5ef1f6b1-7e03-4227-b46b-572b063aba05.png)
…llaumeGomez
Remove special-casing of never primitive in rustdoc-json-types
Fixesrust-lang#89349
r? `@GuillaumeGomez`
Remove unwrap_or! macro
Removes `unwrap_or!` macro and replaces it with `match`.
It's kinda cleanup, as rustc_ast not the best place for this macro and this is used only in 2 places anyway.
@rustbotrustbot added the rollup A PR which is a rollup label Oct 8, 2021
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=6 rollup=never

@bors

bors commented Oct 8, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit cda07c7 has been approved by GuillaumeGomez

@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 8, 2021
@bors

bors commented Oct 8, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit cda07c7 with merge f875143...

@bors

bors commented Oct 9, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing f875143 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 9, 2021
@bors
bors merged commit f875143 into rust-lang:masterOct 9, 2021
@rustbotrustbot added this to the 1.57.0 milestone Oct 9, 2021
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (f875143): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@GuillaumeGomez
GuillaumeGomez deleted the rollup-q2mjd9m branch October 9, 2021 09:50
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.

9 participants

@GuillaumeGomez@bors@rust-timer@rustbot@notriddle@b-naber@Urgau@klensy@matthiaskrgr