Rollup of 6 pull requests #117590

matthiaskrgr · 2023-11-04T20:38:31Z

Successful merges:

Deref docs: expand and remove "smart pointer" qualifier #110340 (Deref docs: expand and remove "smart pointer" qualifier)
Guarantee that char has the same size and alignment as u32 #116894 (Guarantee that char has the same size and alignment as u32)
clarify that the str invariant is a safety, not validity, invariant #117534 (clarify that the str invariant is a safety, not validity, invariant)
triagebot no-merges: exclude different case #117562 (triagebot no-merges: exclude different case)
fallback for construct_generic_bound_failure #117570 (fallback for construct_generic_bound_failure)
Remove 'tcx lifetime on PlaceholderConst #117583 (Remove 'tcx lifetime on PlaceholderConst)

r? @ghost
@rustbot modify labels: rollup

Co-authored-by: scottmcm <[email protected]>

"Subtree update" as well

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

…-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.~~

Guarantee that `char` has the same size and alignment as `u32`

clarify that the str invariant is a safety, not validity, invariant Updates these docs to match rust-lang/reference#792

…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`

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.

…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.

matthiaskrgr · 2023-11-04T20:38:41Z

@bors r+ rollup=never p=6

bors · 2023-11-04T20:38:44Z

📌 Commit 8912a2b has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-11-04T21:15:12Z

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

bors · 2023-11-04T23:12:04Z

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

rust-timer · 2023-11-04T23:13:46Z

📌 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

rust-timer · 2023-11-05T20:10:27Z

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%)

pnkfelix · 2023-11-07T17:51:41Z

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

@rustbot label: +perf-regression-triaged

joshlf and others added 14 commits October 18, 2023 09:14

Guarantee that char has the same size and alignment as u32

3fea7cc

Update library/core/src/primitive_docs.rs

c278bc1

Co-authored-by: scottmcm <[email protected]>

clarify that the str invariant is a safety, not validity, invariant

57f570b

triagebot no-merges: exclude different case

a745f92

"Subtree update" as well

avoid acronyms when we don't really need them

0550ba5

fallback for construct_generic_bound_failure

a4768fe

No lifetime on PlaceholderConst

bcb97ea

Rollup merge of rust-lang#116894 - joshlf:patch-12, r=RalfJung

805a56f

Guarantee that `char` has the same size and alignment as `u32`

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

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.

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 added the merged-by-bors This PR was explicitly merged by bors. label Nov 4, 2023

bors merged commit 4b85902 into rust-lang:master Nov 4, 2023

rustbot added this to the 1.75.0 milestone Nov 4, 2023

bors mentioned this pull request Nov 5, 2023

Uplift CanonicalVarInfo and friends into rustc_type_ir #117582

Merged

bors mentioned this pull request Nov 5, 2023

Uplift the (new solver) canonicalizer into rustc_next_trait_solver #117586

Merged

rustbot added the perf-regression Performance regression. label Nov 5, 2023

github-actions bot mentioned this pull request Nov 6, 2023

Automated pull from upstream master ferrocene/ferrocene#84

Merged

rustbot added the perf-regression-triaged The performance regression has been triaged. label Nov 7, 2023

matthiaskrgr deleted the rollup-9cqh1q8 branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests #117590

Rollup of 6 pull requests #117590

Uh oh!

matthiaskrgr commented Nov 4, 2023

Uh oh!

matthiaskrgr commented Nov 4, 2023

Uh oh!

bors commented Nov 4, 2023

Uh oh!

bors commented Nov 4, 2023

Uh oh!

bors commented Nov 4, 2023

Uh oh!

rust-timer commented Nov 4, 2023

Uh oh!

rust-timer commented Nov 5, 2023

Uh oh!

pnkfelix commented Nov 7, 2023

Uh oh!

Uh oh!

Rollup of 6 pull requests #117590

Rollup of 6 pull requests #117590

Uh oh!

Conversation

matthiaskrgr commented Nov 4, 2023

Uh oh!

matthiaskrgr commented Nov 4, 2023

Uh oh!

bors commented Nov 4, 2023

Uh oh!

bors commented Nov 4, 2023

Uh oh!

bors commented Nov 4, 2023

Uh oh!

rust-timer commented Nov 4, 2023

Uh oh!

rust-timer commented Nov 5, 2023

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

pnkfelix commented Nov 7, 2023

Uh oh!

Uh oh!