Rollup of 6 pull requests #117103

matthiaskrgr · 2023-10-23T20:26:33Z

Successful merges:

rand use getrandom for freebsd (available since 12.x) #107159 (rand use getrandom for freebsd (available since 12.x))
Make ty::print::Printer take &mut self instead of self #116859 (Make ty::print::Printer take &mut self instead of self)
return unfixed len if pat has reported error #117046 (return unfixed len if pat has reported error)
rustdoc: wrap Type with Box instead of Generics #117070 (rustdoc: wrap Type with Box instead of Generics)
Remove smir from triage and add me to stablemir #117074 (Remove smir from triage and add me to stablemir)
Update .mailmap to promote my livename #117086 (Update .mailmap to promote my livename)

r? @ghost
@rustbot modify labels: rollup

This simplifies the code by removing all the `self` assignments and makes the flow of data clearer - always into the printer. Especially in v0 mangling, which already used `&mut self` in some places, it gets a lot more uniform.

When these `Box<Generics>` types were introduced, `Generics` was made with `Vec` and much larger. Now that it's made with `ThinVec`, `Type` is bigger and should be boxed instead.

Co-authored-by: León Orell Valerian Liehr <[email protected]>

I had apparently forgotten to update the Rust mailmap file for my previous commits!

…kingjubilee rand use getrandom for freebsd (available since 12.x)

…rinters, r=oli-obk Make `ty::print::Printer` take `&mut self` instead of `self` based on rust-lang#116815 This simplifies the code by removing all the `self` assignments and makes the flow of data clearer - always into the printer. Especially in v0 mangling, which already used `&mut self` in some places, it gets a lot more uniform.

return unfixed len if pat has reported error - Fixes rust-lang#116186 - Fixes rust-lang#113021 This issue arises due to the creation of a fixed-length pattern, as a result of the mir body corruption. The corruption taints `tcx.eval_to_allocation_raw`, causing it to return `AlreadyReported`. Consequently, this prevents `len.try_eval_target_usize` from evaluating correctly and returns `None`. Lastly, it results in the return of `[usize; min_len]`. To rectify this issue, my approach is that to return unfixed when encountering `ErrorHandled::Reported`. Additionally, in instances of `ErrorHandled::TooGeneric`, the previous logic has been reinstated.

rustdoc: wrap Type with Box instead of Generics When these `Box<Generics>` types were introduced, `Generics` was made with `Vec` and much larger. Now that it's made with `ThinVec`, `Type` is bigger and should be boxed instead.

Remove smir from triage and add me to stablemir As we discussed this in [weekly ](https://rust-lang.zulipchat.com/#narrow/stream/320896-project-stable-mir/topic/.5Bbi-weekly.5D.202023-10-20)meeting we don't really care for changes that happens in `smir`, we only care about changes that happen to `stable_mir` so I removed smir triage ping and added myself to `stable_mir` ping list

…lacrum Update .mailmap to promote my livename I had apparently forgotten to update the Rust mailmap file for my previous commits. I was sent here from [the about page!](https://thanks.rust-lang.org/about/). Note that the second rule only fires for commits I do at my current place of work, but reclaim them under my personal email address that I expect to use for longer.

matthiaskrgr · 2023-10-23T20:27:06Z

@bors r+ rollup=never p=6

bors · 2023-10-23T20:27:08Z

📌 Commit 85e1a5b has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-23T22:18:49Z

⌛ Testing commit 85e1a5b with merge f654229...

bors · 2023-10-24T00:12:47Z

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

rust-timer · 2023-10-24T00:14:31Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#107159	rand use getrandom for freebsd (available since 12.x)	`3106dcf278042218f936907e75675fd8284afdba` (link)
#116859	Make `ty::print::Printer` take `&mut self` instead of `self`	`03e5b50aeb25dabb96e92ec4246b6446d02f461b` (link)
#117046	return unfixed len if pat has reported error	`7ff9ed7f762e422c650a8f8c2cb6ca2743ca1ea9` (link)
#117070	rustdoc: wrap Type with Box instead of Generics	`e23ba6fefc35e147b6a4d39306ca84360d15a3ef` (link)
#117074	Remove smir from triage and add me to stablemir	`dd07225684a214dff1cd46c8767dc4d37a7b1ac5` (link)
#117086	Update .mailmap to promote my livename	`ad92d0fb6c567888c8823d1bf366f4263e91fac6` (link)

previous master: 41aa06ecf9

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-24T03:16:26Z

Finished benchmarking commit (f654229): 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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.5%	[-5.5%, -5.5%]	1
All ❌✅ (primary)	-	-	0

Cycles

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

Binary size

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

Bootstrap: missing data
Artifact size: 304.29 MiB -> 304.34 MiB (0.02%)

Resolves issues caused by 1. rust-lang/rust#116958 2. rust-lang/rust#117103

devnexen and others added 13 commits July 30, 2023 10:32

rand use getrandom for freebsd (available since 12.x)

4b73cf3

Make ty::print::Printer take &mut self instead of self

5acf26b

This simplifies the code by removing all the `self` assignments and makes the flow of data clearer - always into the printer. Especially in v0 mangling, which already used `&mut self` in some places, it gets a lot more uniform.

rustdoc: wrap Type with Box instead of Generics

b67985e

When these `Box<Generics>` types were introduced, `Generics` was made with `Vec` and much larger. Now that it's made with `ThinVec`, `Type` is bigger and should be boxed instead.

Remove FIXME after fix

f1a1ef6

Co-authored-by: León Orell Valerian Liehr <[email protected]>

return unfixed len if pat has reported error

6de40ab

Update .mailmap to promote my livename

320ca83

I had apparently forgotten to update the Rust mailmap file for my previous commits!

Remove smir from triage and add me to stablemir

dc1cd4c

Rollup merge of rust-lang#107159 - devnexen:random_fbsd_update, r=wor…

d287861

…kingjubilee rand use getrandom for freebsd (available since 12.x)

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 23, 2023

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

bors merged commit f654229 into rust-lang:master Oct 24, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 24, 2023

bors mentioned this pull request Oct 24, 2023

Remove Apple RNG fallbacks and simplify implementation #116319

Merged

jaisnan mentioned this pull request Oct 27, 2023

Fix issues and Update toolchain 10-26 model-checking/kani#2843

Merged

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

Automated pull from upstream master ferrocene/ferrocene#74

Merged

adpaco-aws pushed a commit to model-checking/kani that referenced this pull request Oct 31, 2023

Fix issues and Update toolchain 10-26 (#2843)

d230735

Resolves issues caused by 1. rust-lang/rust#116958 2. rust-lang/rust#117103

matthiaskrgr deleted the rollup-96zuuom branch March 16, 2024 18:18

matthiaskrgr mentioned this pull request Apr 16, 2024

ICE: node HirId ... cannot be placed in TypeckResults with hir_owner DefId... #124022

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #117103

Rollup of 6 pull requests #117103

matthiaskrgr commented Oct 23, 2023

matthiaskrgr commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 24, 2023

rust-timer commented Oct 24, 2023

rust-timer commented Oct 24, 2023

Rollup of 6 pull requests #117103

Rollup of 6 pull requests #117103

Conversation

matthiaskrgr commented Oct 23, 2023

matthiaskrgr commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 24, 2023

rust-timer commented Oct 24, 2023

rust-timer commented Oct 24, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size