Rollup of 6 pull requests #117272

matthiaskrgr · 2023-10-27T09:48:08Z

Successful merges:

feat(docs): add cargo-pgo to PGO documentation 📝 #114998 (feat(docs): add cargo-pgo to PGO documentation 📝)
Tweak suggestion span for outer attr and point at item following invalid inner attr #116868 (Tweak suggestion span for outer attr and point at item following invalid inner attr)
Fix documentation typo in std::iter::Iterator::collect_into #117240 (Fix documentation typo in std::iter::Iterator::collect_into)
Stash and cancel cycle errors for auto trait leakage in opaques #117241 (Stash and cancel cycle errors for auto trait leakage in opaques)
Create a new ConstantKind variant (ZeroSized) for StableMIR #117262 (Create a new ConstantKind variant (ZeroSized) for StableMIR)
replace transmute by raw pointer cast #117266 (replace transmute by raw pointer cast)

r? @ghost
@rustbot modify labels: rollup

Co-authored-by: Jakub Beránek <[email protected]>

ZeroSized constants can be represented as `mir::Const::Val` even if their layout is not yet known. In those cases, CrateItem::body() was crashing when trying to convert a `ConstValue::ZeroSized` into its stable counterpart `ConstantKind::Allocated`. Instead, we now map `ConstValue::ZeroSized` into a new variant: `ConstantKind::ZeroSized`.

…-to-docs, r=ehuss feat(docs): add cargo-pgo to PGO documentation 📝 fixes rust-lang#114995

Tweak suggestion span for outer attr and point at item following invalid inner attr After: ``` error: `unix_sigpipe` attribute cannot be used at crate level --> $DIR/unix_sigpipe-crate.rs:2:1 | LL | #![unix_sigpipe = "inherit"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ LL | LL | fn main() {} | ------------ the inner attribute doesn't annotate this function | help: perhaps you meant to use an outer attribute | LL - #![unix_sigpipe = "inherit"] LL + #[unix_sigpipe = "inherit"] | ``` Before: ``` error: `unix_sigpipe` attribute cannot be used at crate level --> $DIR/unix_sigpipe-crate.rs:2:1 | LL | #![unix_sigpipe = "inherit"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: perhaps you meant to use an outer attribute | LL | #[unix_sigpipe = "inherit"] | ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` CC rust-lang#89566.

…llect-into-fix-typo, r=the8472 Fix documentation typo in std::iter::Iterator::collect_into

…cle, r=oli-obk Stash and cancel cycle errors for auto trait leakage in opaques We don't need to emit a traditional cycle error when we have a selection error that explains what's going on but in more detail. We may want to augment this error to actually point out the cycle, now that the cycle error is not being emitted. We could do that by storing the set of opaques that was in the `CyclePlaceholder` that gets returned from `type_of_opaque`. r? `@oli-obk` cc `@estebank` rust-lang#117235

Create a new ConstantKind variant (ZeroSized) for StableMIR ZeroSized constants can be represented as `mir::Const::Val` even if their layout is not yet known. In those cases, CrateItem::body() was crashing when trying to convert a `ConstValue::ZeroSized` into its stable counterpart `ConstantKind::Allocated`. Instead, we now map `ConstValue::ZeroSized` into a new variant: `ConstantKind::ZeroSized`. **Note:** I didn't add any new test here since we already have covering tests in our project repository which I manually confirmed that will fix the issue.

replace transmute by raw pointer cast Now that rust-lang#113257 is fixed we can finally do this. :)

matthiaskrgr · 2023-10-27T09:48:23Z

@bors r+ rollup=never p=6

bors · 2023-10-27T09:48:25Z

📌 Commit 2fdac63 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-27T10:19:38Z

⌛ Testing commit 2fdac63 with merge 95f6a01...

bors · 2023-10-27T12:14:53Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 95f6a01 to master...

rust-timer · 2023-10-27T12:16:35Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#114998	feat(docs): add cargo-pgo to PGO documentation 📝	`d3c2955e0a0f04cd529ecb2df17fc0da36ca96e6` (link)
#116868	Tweak suggestion span for outer attr and point at item foll…	`d25c5a044c4ef179f1e41c1ab31fee9f0ea86ad6` (link)
#117240	Fix documentation typo in std::iter::Iterator::collect_into	`3836c0541ed382c328f63c8ec3f6108fe3f8bd14` (link)
#117241	Stash and cancel cycle errors for auto trait leakage in opa…	`00831a8acf819278723901b096c0a36e17b45c81` (link)
#117262	Create a new ConstantKind variant (ZeroSized) for StableMIR	`4bcc366bb2077073bbdaf7f2c096f432e17b6d30` (link)
#117266	replace transmute by raw pointer cast	`e5a2c08da6bd50663c1f9e7558052a0345f404dd` (link)

previous master: 54e57e66ff

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-10-27T13:37:10Z

Finished benchmarking commit (95f6a01): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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)	3.1%	[3.1%, 3.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.1%	[3.1%, 3.1%]	1

Cycles

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

Binary size

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.1%	[0.0%, 0.1%]	9
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.1%	[-0.1%, -0.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[-0.1%, 0.1%]	10

Bootstrap: 634.843s -> 636.074s (0.19%)
Artifact size: 304.48 MiB -> 304.47 MiB (-0.00%)

meysam81 and others added 15 commits August 20, 2023 14:54

feat(docs): add cargo-pgo to PGO documentation 📝

15f0149

Update src/doc/rustc/src/profile-guided-optimization.md

29ec0ec

Co-authored-by: Jakub Beránek <[email protected]>

Update src/doc/rustc/src/profile-guided-optimization.md

3ecc8c3

Co-authored-by: Jakub Beránek <[email protected]>

Update profile-guided-optimization.md

515535a

Fix documentation typo in std::iter::Iterator::collect_into

4392230

Stash and cancel cycle errors for auto trait leakage in opaques

1836c1f

Tweak suggestion spans for invalid crate-level inner attribute

27919ce

CC rust-lang#89566.

replace transmute by raw pointer cast

b3f7f4d

Rollup merge of rust-lang#114998 - meysam81:meysam/feat/add-cargo-pgo…

8d67c32

…-to-docs, r=ehuss feat(docs): add cargo-pgo to PGO documentation 📝 fixes rust-lang#114995

Rollup merge of rust-lang#117240 - trueNAHO:docs-std-iter-Iterator-co…

203292e

…llect-into-fix-typo, r=the8472 Fix documentation typo in std::iter::Iterator::collect_into

Rollup merge of rust-lang#117266 - RalfJung:cast-not-transmute, r=thomcc

2fdac63

replace transmute by raw pointer cast Now that rust-lang#113257 is fixed we can finally do this. :)

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 Oct 27, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 27, 2023

bors merged commit 95f6a01 into rust-lang:master Oct 27, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 27, 2023

bors mentioned this pull request Oct 27, 2023

Optimize hash map operations in the query system #115747

Closed

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

matthiaskrgr deleted the rollup-upg122z branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #117272

Rollup of 6 pull requests #117272

matthiaskrgr commented Oct 27, 2023

matthiaskrgr commented Oct 27, 2023

bors commented Oct 27, 2023

bors commented Oct 27, 2023

bors commented Oct 27, 2023

rust-timer commented Oct 27, 2023

rust-timer commented Oct 27, 2023

Rollup of 6 pull requests #117272

Rollup of 6 pull requests #117272

Conversation

matthiaskrgr commented Oct 27, 2023

matthiaskrgr commented Oct 27, 2023

bors commented Oct 27, 2023

bors commented Oct 27, 2023

bors commented Oct 27, 2023

rust-timer commented Oct 27, 2023

rust-timer commented Oct 27, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size