Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 6 pull requests #105008

Merged
merged 22 commits into from
Nov 28, 2022
Merged

Rollup of 6 pull requests #105008

merged 22 commits into from
Nov 28, 2022

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

lcnr and others added 22 commits November 25, 2022 15:52
@lcnr
small method code cleanup
40a0533
@lcnr
remove TypeError::ObjectUnsafeCoercion
a215b7b
@lcnr
remove confusing comment
4f07008 
`?0: CoerceUnsized<SomeTy>` can definitely apply because
`?0` matches any type, same for `SomeTy: CoerceUnsized<?0>`
@compiler-errors
Remove SelectionContext::infcx() in favor of field access
6436c34
@compiler-errors
simplify some binder shifting logic
61e185b
@WaffleLapkin
Rename fn_trait_kind_from_{from_lang=>def_id} to better convey meaning
881862e
@WaffleLapkin
Remove ty::ClosureKind::from_def_id
d0c7ed3 
…in favour of `TyCtxt::fn_trait_kind_from_def_id`
@WaffleLapkin
Add TyCtxt::is_fn_trait
4b6e1d1
@WaffleLapkin
Simplify ty::ClosureKind::extends
fa89f53 
This is valid per the comment of the `ClosureKind` defition
@WaffleLapkin
micro doc fixes
ea44792
@WaffleLapkin
Use TyCtxt::is_fn_trait is a couple more places
5ba0056
@petrochenkov
Stabilize native library modifier verbatim
5b0e80e
@lcnr @fee1-dead
fix type
99c3dda 
Co-authored-by: fee1-dead <ent3rm4n@gmail.com>
@estebank
Change multiline span ASCII art visual order
ab04080
@estebank
Tweak output
6f64432
@estebank
fix clippy tests
136ffa2
@Dylan-DPC
Rollup merge of rust-lang#104360 - petrochenkov:stabverb, r=TaKO8Ki
f33d409 
Stabilize native library modifier `verbatim`

Stabilization report - rust-lang#104360 (comment).

cc rust-lang#81490
Closes rust-lang#99425
@Dylan-DPC
Rollup merge of rust-lang#104732 - WaffleLapkin:from_def_idn't, r=com…
f90484d 
…piler-errors

Refactor `ty::ClosureKind` related stuff

I've tried to fix all duplication and weirdness, but if I missed something do tell :p

r? `@compiler-errors`
@Dylan-DPC
Rollup merge of rust-lang#104795 - estebank:multiline-spans, r=TaKO8Ki
79fe15c 
Change multiline span ASCII art visual order

Tweak the ASCII art for nested multiline spans so that we minimize line overlaps.

Partially addresses rust-lang#61017.
@Dylan-DPC
Rollup merge of rust-lang#104890 - lcnr:small-cleanup, r=fee1-dead
8a84dd8 
small method code cleanup
@Dylan-DPC
Rollup merge of rust-lang#104907 - compiler-errors:selcx-infcx, r=oli…
9178bc0 
…-obk

Remove `SelectionContext::infcx()` in favor of field access

Encapsulation doesn't seem particularly important here, and having two choices is always more confusing than having one.

r? types
@Dylan-DPC
Rollup merge of rust-lang#104927 - compiler-errors:binder-shifting-lo…
d5de2a8 
…gic, r=oli-obk

Simplify some binder shifting logic

Not sure if worth, but we'll see
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Nov 28, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Nov 28, 2022

📌 Commit d5de2a8 has been approved by Dylan-DPC

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 28, 2022
@bors
Copy link
Contributor

bors commented Nov 28, 2022

⌛ Testing commit d5de2a8 with merge 8a09420...

@bors
Copy link
Contributor

bors commented Nov 28, 2022

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 8a09420 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 28, 2022
@bors bors merged commit 8a09420 into rust-lang:master Nov 28, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 28, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#104927 a7639f5b1395e3eabdd4218e6aecc1aba728fc38
#104907 580b2680e1175068ee3d614767dde609a0623b30
#104890 d6c3f38fcf35f7150ce074235fc3f40d3e06a50a
#104795 c1396e78019e2666713385e906569911c98f6401
#104732 f433f4ffca681b5bf89d59f9d12942369b4a0fb6
#104360 0c2b3402f6ad722434c00419805ddfb6216d794d

previous master: 69df0f2c2f

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@Dylan-DPC Dylan-DPC deleted the rollup-wcd19yu branch November 28, 2022 17:05
This was referenced Nov 28, 2022
Merged
Closed
Merged
Merged
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8a09420): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.6% [0.2%, 0.9%] 8
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.9% [-0.9%, -0.8%] 2
Improvements ✅
(secondary)		 -2.4% [-2.7%, -2.1%] 6
All ❌✅ (primary) 0.3% [-0.9%, 0.9%] 10

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.2% [-2.2%, -2.2%] 1
Improvements ✅
(secondary)		 -1.3% [-1.3%, -1.3%] 1
All ❌✅ (primary) -2.2% [-2.2%, -2.2%] 1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.7% [-3.3%, -2.1%] 6
All ❌✅ (primary) - - 0

@rustbot rustbot added the perf-regression Performance regression. label Nov 29, 2022
@lqd lqd mentioned this pull request Nov 29, 2022
Merged
@nnethercote
Copy link
Contributor

These perf changes are all noise.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Nov 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.67.0
Development

Successfully merging this pull request may close these issues.
10 participants
@Dylan-DPC @bors @rust-timer @nnethercote @rustbot @lcnr @compiler-errors @WaffleLapkin @petrochenkov @estebank