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 #117590

Merged
merged 14 commits into from
Nov 4, 2023
Merged

Rollup of 6 pull requests #117590

merged 14 commits into from
Nov 4, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

joshlf and others added 14 commits October 18, 2023 09:14
@joshlf
Guarantee that char has the same size and alignment as u32
3fea7cc
@joshlf @scottmcm
Update library/core/src/primitive_docs.rs
c278bc1 
Co-authored-by: scottmcm <[email protected]>
@RalfJung
clarify that the str invariant is a safety, not validity, invariant
57f570b
@pitaj
triagebot no-merges: exclude different case
a745f92 
"Subtree update" as well
@RalfJung
avoid acronyms when we don't really need them
0550ba5
@bvanjoi
fallback for construct_generic_bound_failure
a4768fe
@compiler-errors
No lifetime on PlaceholderConst
bcb97ea
@jmaargh
Draft fleshed-out deref docs
7a2f83f 
Re-draft Deref docs

Make general advice more explicit and note the difference between
generic and specific implementations.

Re-draft DerefMut docs in-line with Deref

Fix Deref docs typos

Fix broken links

Clarify advice for specific-over-generic impls

Add comment addressing Issue rust-lang#73682

x fmt

Copy faillibility warning to DerefMut
@matthiaskrgr
Rollup merge of rust-lang#110340 - jmaargh:jmaargh/deref-docs, r=Mark…
58645e0 
…-Simulacrum

Deref docs: expand and remove "smart pointer" qualifier

**Ready for review**

~~This is an unpolished draft to be sanity-checked~~

Fixes rust-lang#91004

~~Comments on substance and content of this are welcome. This is deliberately unpolished until ready to review so please try to stay focused on the big-picture.~~

~~Once this has been sanity checked, I will similarly update `DerefMut` and polish for review.~~
@matthiaskrgr
Rollup merge of rust-lang#116894 - joshlf:patch-12, r=RalfJung
805a56f 
Guarantee that `char` has the same size and alignment as `u32`
@matthiaskrgr
Rollup merge of rust-lang#117534 - RalfJung:str, r=Mark-Simulacrum
1ee5e12 
clarify that the str invariant is a safety, not validity, invariant

Updates these docs to match rust-lang/reference#792
@matthiaskrgr
Rollup merge of rust-lang#117562 - pitaj:triagebot_no-merges, r=Mark-…
b9dcbd4 
…Simulacrum

triagebot no-merges: exclude different case

"Subtree update" as well

To address [this on zulip](https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/can't.20suppress.20merge.20commit.20warning)

cc `@bjorn3`

r? `@mark-simulacrum`
@matthiaskrgr
Rollup merge of rust-lang#117570 - bvanjoi:fix-117547, r=cjgillot
a47c137 
fallback for `construct_generic_bound_failure`

Fixes rust-lang#117547

This case regressed at rust-lang#115882.

In this context, `generic_param_scope` is produced by `RPITVisitor` and not included by `hir_owner`. Therefore, I've added a fallback to address this.
@matthiaskrgr
Rollup merge of rust-lang#117583 - compiler-errors:placeholderconst-l…
8912a2b 
…ifetime, r=cjgillot

Remove `'tcx` lifetime on `PlaceholderConst`

The `'tcx` lifetime is not needed for anything, so this is a continuation of rust-lang#117139.
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Nov 4, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Nov 4, 2023

📌 Commit 8912a2b 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 Nov 4, 2023
@bors
Copy link
Contributor

bors commented Nov 4, 2023

⌛ Testing commit 8912a2b with merge 4b85902...

@bors
Copy link
Contributor

bors commented Nov 4, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 4b85902 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 4, 2023
@bors bors merged commit 4b85902 into rust-lang:master Nov 4, 2023
12 checks passed
@rustbot rustbot added this to the 1.75.0 milestone Nov 4, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#110340 Deref docs: expand and remove "smart pointer" qualifier c7bc7d413c9739463d97de92ee8e8fea94556457 (link)
#116894 Guarantee that char has the same size and alignment as `u… 57a531923d7eb947b638a729ac41d3b710df0593 (link)
#117534 clarify that the str invariant is a safety, not validity, i… 54a6bd0d195a9f2feaa0018f222814af7fd595f5 (link)
#117562 triagebot no-merges: exclude different case 9618932cc139a9604eb9fbee302fa8d2f18f922e (link)
#117570 fallback for construct_generic_bound_failure 541d6767a23aa17c43af5d570121899c0660d910 (link)
#117583 Remove 'tcx lifetime on PlaceholderConst 7840a10c85ae5f3230cd175606f6d91fcda764e9 (link)

previous master: a42d94ebb8

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

@bors bors mentioned this pull request Nov 5, 2023
Merged
@bors bors mentioned this pull request Nov 5, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4b85902): 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

Warning ⚠: The following benchmark(s) failed to build:

  • externs
  • cargo-0.60.0
  • bitmaps-3.1.0

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)		 12.7% [0.4%, 30.9%] 6
Regressions ❌
(secondary)		 16.2% [8.1%, 24.2%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 12.7% [0.4%, 30.9%] 6

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)		 2.5% [0.5%, 6.0%] 9
Regressions ❌
(secondary)		 7.4% [4.0%, 10.8%] 2
Improvements ✅
(primary)		 -1.4% [-2.1%, -0.6%] 3
Improvements ✅
(secondary)		 -2.8% [-2.8%, -2.8%] 1
All ❌✅ (primary) 1.5% [-2.1%, 6.0%] 12

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)		 10.1% [0.5%, 27.4%] 7
Regressions ❌
(secondary)		 14.6% [2.0%, 29.6%] 3
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 10.1% [0.5%, 27.4%] 7

Binary size

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

Bootstrap: 634.557s -> 635.284s (0.11%)
Artifact size: 304.51 MiB -> 304.41 MiB (-0.03%)

@rustbot rustbot added the perf-regression Performance regression. label Nov 5, 2023
@github-actions github-actions bot mentioned this pull request Nov 6, 2023
Merged
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Nov 6, 2023
@bors-ferrocene @BenWiederhake
@SabrinaJewson @J-ZhengLi @koka831 @bjorn3 @joshlf @lengyijun @Zalathar @oli-obk @flip1995 @y21 @bors @bvanjoi
Merge #84
a01e81f 
84: Automated pull from upstream `master` r=Dajamante a=github-actions[bot]


This PR pulls the following changes from the upstream repository:

* rust-lang/rust#117585
* rust-lang/rust#117576
* rust-lang/rust#96979
* rust-lang/rust#117191
* rust-lang/rust#117179
* rust-lang/rust#117574
* rust-lang/rust#117537
* rust-lang/rust#117608
  * rust-lang/rust#117596
  * rust-lang/rust#117588
  * rust-lang/rust#117524
  * rust-lang/rust#116017
* rust-lang/rust#117504
* rust-lang/rust#117469
* rust-lang/rust#116218
* rust-lang/rust#117589
* rust-lang/rust#117581
* rust-lang/rust#117503
* rust-lang/rust#117590
  * rust-lang/rust#117583
  * rust-lang/rust#117570
  * rust-lang/rust#117562
  * rust-lang/rust#117534
  * rust-lang/rust#116894
  * rust-lang/rust#110340
* rust-lang/rust#113343
* rust-lang/rust#117579
* rust-lang/rust#117094
* rust-lang/rust#117566
* rust-lang/rust#117564
  * rust-lang/rust#117554
  * rust-lang/rust#117550
  * rust-lang/rust#117343
* rust-lang/rust#115274
* rust-lang/rust#117540
* rust-lang/rust#116412
* rust-lang/rust#115333
* rust-lang/rust#117507
* rust-lang/rust#117538
  * rust-lang/rust#117533
  * rust-lang/rust#117523
  * rust-lang/rust#117520
  * rust-lang/rust#117505
  * rust-lang/rust#117434
* rust-lang/rust#117535
* rust-lang/rust#117510
* rust-lang/rust#116439
* rust-lang/rust#117508



Co-authored-by: Ben Wiederhake <[email protected]>
Co-authored-by: SabrinaJewson <[email protected]>
Co-authored-by: J-ZhengLi <[email protected]>
Co-authored-by: koka <[email protected]>
Co-authored-by: bjorn3 <[email protected]>
Co-authored-by: Joshua Liebow-Feeser <[email protected]>
Co-authored-by: lengyijun <[email protected]>
Co-authored-by: Zalathar <[email protected]>
Co-authored-by: Oli Scherer <[email protected]>
Co-authored-by: Philipp Krones <[email protected]>
Co-authored-by: y21 <[email protected]>
Co-authored-by: bors <[email protected]>
Co-authored-by: bohan <[email protected]>
@pnkfelix
Copy link
Member

pnkfelix commented Nov 7, 2023

  • the primary regressions (bitmaps and cargo), while huge, are also clearly noise.
  • marking as triaged.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Nov 7, 2023
@matthiaskrgr matthiaskrgr deleted the rollup-9cqh1q8 branch March 16, 2024 18:18
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-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.75.0
Development

Successfully merging this pull request may close these issues.