Skip to content

Rollup of 8 pull requests - #79138

Merged
bors merged 25 commits into
rust-lang:masterfrom
m-ou-se:rollup-owel5ld
Nov 17, 2020
Merged

Rollup of 8 pull requests#79138
bors merged 25 commits into
rust-lang:masterfrom
m-ou-se:rollup-owel5ld

Conversation

@m-ou-se

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

wesleywiserand others added 25 commits November 3, 2020 07:55
This is helpful when looking for CGUs where the size estimate isn't a
good indicator of compilation time.
I verified that moving the profiling timer call doesn't affect the
results.
This is mostly me learning the codebase, so feel free to close the PR.
It does have the small benefit that we statically know rustdoc isn't
generating useless `span`s, though.
It's the same as clean::Function.
Replace it instead with `(clean::Function, Option<hir::Defaultness>)`.
It was exactly the same as `is_auto`.
…r-output-color, r=jyn514
Rustdoc test compiler output color
Fixesrust-lang#72915
We just need to be sure it doesn't break rustdoc doctests' compilation checks. Maybe some other unforeseen consequences too?
r? `@ehuss`
cc `@rust-lang/rustdoc`
… r=Mark-Simulacrum
[self-profiling] Include the estimated size of each cgu in the profile
This is helpful when looking for CGUs where the size estimate isn't a
good indicator of compilation time.
I verified that moving the profiling timer call doesn't affect the
results.
Results:
<img width="297" alt="Screen Shot 2020-11-03 at 7 25 04 AM" src="https://user-images.githubusercontent.com/831192/97985503-5901d100-1da6-11eb-9f10-f3e399702952.png">
`measureme` doesn't have support for custom arg names yet so `arg0` is the CGU name and `arg1` is the estimated size.
Get rid of `highlight::Class::None`
This is mostly me learning the codebase for rust-lang#77939, so feel free to close the PR.
It does have the small benefit that we statically know rustdoc isn't generating useless `span`s, though.
r? `@GuillaumeGomez`
cc `@matklad`
Fix exhaustiveness in case a byte string literal is used at slice type
fixesrust-lang#79048
Get rid of clean::{Method, TyMethod}
They're redundant and almost the same as `clean::Function`.
I needed this for rust-lang#78082, although I forget why.
r? `@GuillaumeGomez`
Remove duplicate `Trait::auto` field
It was exactly the same as `is_auto`.
I found this while working on rust-lang#78082, but it's not required for that PR.
r? `@GuillaumeGomez`
@rustbotrustbot added the rollup A PR which is a rollup label Nov 17, 2020
@m-ou-se

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=8 rollup=never

@bors

bors commented Nov 17, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit f698505 has been approved by m-ou-se

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 17, 2020
@bors

bors commented Nov 17, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f698505 with merge c919f49...

@bors

bors commented Nov 17, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: m-ou-se
Pushing c919f49 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Nov 17, 2020
@bors
bors merged commit c919f49 into rust-lang:masterNov 17, 2020
@rustbotrustbot added this to the 1.50.0 milestone Nov 17, 2020
@m-ou-se
m-ou-se deleted the rollup-owel5ld branch November 17, 2020 17: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

@m-ou-se@bors@rustbot@wesleywiser@jyn514@calebcartwright@oli-obk@lcnr@GuillaumeGomez