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 7 pull requests #105667

Merged
merged 36 commits into from
Dec 14, 2022
Merged

Rollup of 7 pull requests #105667

merged 36 commits into from
Dec 14, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

nbdd0121 and others added 30 commits December 8, 2022 17:23
@nbdd0121
Support #[track_caller] on async closures
0c0fb22
@nbdd0121
Move paren expr and loop HIR lowering
6275b04
@nbdd0121
Bless incremental tests
3c0983c
@spastorino
Fix typo
8937720
@spastorino
Join match arms since they do the same thing
b0c3228
@nbdd0121
Allow unsafe through inline const
9342d1e 
This is handled similar to closures
@nbdd0121
Allow unsafe through inline const for THIR unsafety checker
aa5af2a 
The closure handling code is changed slightly to avoid allocation
when THIR building failed.
@nbdd0121
Add tests
f03c2ae
@nbdd0121
Ensure valid local_data is set for custom mir building
adf1717 
MIR unsafety checking requires this to be valid
@nbdd0121
Remove unnecessary recursive call to parent unsafeck
5c58a1b 
All bodies are unsafe checked anyway. Current MIR unsafeck also just
returns for closures.
@nbdd0121
Add tests (currently broken) for unsafe + inline const pat
d2830cb
@nbdd0121
Extract shared logic into a new function
d6dc912
@compiler-errors
Move some codegen-y methods from rustc_hir_analysis::collect -> rustc…
a8a4510 
…_codegen_ssa
@oli-obk
Make some diagnostics not depend on the source of what they reference…
cb26b35 
… being available
@oli-obk
Inform the user which trait is meant in the diagnostic itself instead…
717294f 
… of relying on the span making it obvious
@oli-obk
Clarify what "this" means
063b167
@oli-obk
Don't emit empty notes
2e2a479
@oli-obk
Avoid rendering empty annotations
59554a2
@oli-obk
Stop pointing to operators if their libcore method source is not avai…
6984085 
…lable
@oli-obk
Use a label instead of a note for the drop site to create denser diag…
1f5cb9e 
…nostics
@oli-obk
bless fulldeps tests
82ce70a
@JakobDegen
Don't require owned data in MaybeStorageLive
3522d48
@spastorino
Make InternalSubsts rust docs a bit clearer
4ae0c55
@spastorino
Clarify explicit_predicates_of is_assoc_item_ty comment
b22769a
@estebank
Change pattern borrowing suggestions to be verbose
e46416e 
Synthesize a more accurate span and use verbose suggestion output to
make the message clearer.
@estebank
Do not suggest borrowing binding in pattern in let else
4f7c257 
Fix rust-lang#104838.
@estebank
Suggest ref for some patterns as a fallback
dd72b1a
@estebank
Fix span for &mut removal suggestion
b8bd1d0
@estebank
Account for dereference expressions
cf0b6b9
@matthiaskrgr
Rollup merge of rust-lang#105147 - nbdd0121:inline_const_unsafe, r=ol…
7357cfb 
…i-obk

Allow unsafe through inline const

Handle similar to closures.

Address rust-lang#104087 (comment)

Note that this PR does not fix the issue for `unsafe { [0; function_requiring_unsafe()] }`. This is fundamentally unfixable for MIR unsafeck IMO.

This PR also does not fix unsafety checking for inline const in pattern position. It actually breaks it, allowing unsafe functions to be used in inline const in pattern position without unsafe blocks. Inline const in pattern position is not visible in MIR so ignored by MIR unsafety checking (currently it is also not checked by borrow checker, which is the reason why it's considered an incomplete feature).

`@rustbot` label: +T-lang +F-inline_const
@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. rollup A PR which is a rollup labels Dec 13, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Dec 13, 2022

📌 Commit e0e9f3a has been approved by matthiaskrgr

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 Dec 13, 2022
@bors
Copy link
Contributor

bors commented Dec 13, 2022

⌛ Testing commit e0e9f3a with merge 21ee03e...

@bors
Copy link
Contributor

bors commented Dec 14, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 21ee03e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 14, 2022
@bors bors merged commit 21ee03e into rust-lang:master Dec 14, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 14, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#105659 6c1639f00f66787d2f0fe62106af516c41989a70
#105628 4db007f9a75199a5acb3e1b5770431f1189280eb
#105500 c4fde12be215a1118430085e41513ae79de778ae
#105476 995a21ef77d5f5a4c41306ab5ebc73a7b567d9b0
#105464 75919175737cd51173a64ddc7a4fff1e00761c3c
#105438 0cf8262d36702477fdd668f1b36fc5486f26d255
#105147 47516404a8df0230f5df7e0855f67961d83e84a1

previous master: 0f529f0f49

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

This was referenced Dec 14, 2022
Merged
Closed
Merged
Merged
Closed
Merged
Merged
Merged
Merged
Closed
Merged
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (21ee03e): comparison URL.

Overall result: ❌ regressions - 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.4% [0.4%, 0.5%] 2
Regressions ❌
(secondary)		 0.6% [0.2%, 1.3%] 20
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.4% [0.4%, 0.5%] 2

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)		 2.1% [1.1%, 3.5%] 9
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.6% [-7.1%, -1.7%] 4
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

@rustbot rustbot added the perf-regression Performance regression. label Dec 14, 2022
@Mark-Simulacrum
Copy link
Member

This seems largely due to noisy benchmarks.

@Mark-Simulacrum Mark-Simulacrum removed the perf-regression Performance regression. label Dec 20, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-fexlc0b branch December 22, 2022 10:46
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
A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic merged-by-bors This PR was explicitly merged by bors. 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.
Projects
None yet
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.