Skip to content

Rollup of 8 pull requests #135848

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 18 commits into from
Jan 22, 2025
Merged

Rollup of 8 pull requests #135848

merged 18 commits into from
Jan 22, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

asomers and others added 18 commits October 28, 2024 08:58
13.2 is EoL, and 13.3 will be EoL too in about 2 months.  Plus, both
suffer from a bug in LLVM's libunwind.  It causes a segfault inside of
std::backtrace::Backtrace::capture().

Fixes rust-lang#132185
Just the basic quadratic version that you wouldn't actually want for a true bigint, but it's nice and short so is useful as an example :)
It is very long and tends to match a lot of search queries. It's not useful to show with ripgrep.

Note that this does not actually untrack the file; changes can still be committed (although I suspect it may not have been intentional to commit originally?). This just changes how it interacts with tools that use `.gitignore` as a default filter.
All remaining `Makefile`s have open PRs that do not rely on platform
`cat` or `grep`.
CI: build FreeBSD artifacts on FreeBSD 13.4

13.2 is EoL, and 13.3 will be EoL too in about 2 months.  Plus, both suffer from a bug in LLVM's libunwind.  It causes a segfault inside of std::backtrace::Backtrace::capture().

Fixes rust-lang#132185

cc ``````@ehuss`````` .  before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names.

try-job: dist-x86_64-freebsd
try-job: dist-various-2
Move `supertrait_def_ids` into the elaborate module like all other fns

It's strange that this is the only elaborate-like fn on tcx.

r? lcnr
Add an example of using `carrying_mul_add` to write wider multiplication

Just the basic quadratic version that you wouldn't actually use for really-big integers, but it's nice and short so is useful as for a demonstration of why you might find `carrying_mul_add` useful :)

cc rust-lang#85532 ``````@clarfonthey``````
Ignore `mermaid.min.js`

It is very long and tends to match a lot of search queries. It's not useful to show with ripgrep.

Note that this does not actually untrack the file; changes can still be committed (although I suspect it may not have been intentional to commit originally?). This just changes how it interacts with tools that use `.gitignore` as a default filter.

r? rustc-dev-guide
…bzol

Add Kobzol on vacation

I will be mostly reviewing diaper contents in the upcoming weeks, so I'm (proactively, for now) removing myself from the auto review rotation. Feel free to CC me (explicit `r?` won't work) explicitly though, I will be around.

r? `````@ghost`````
fix OsString::from_encoded_bytes_unchecked description

fixes rust-lang#133010
…Noratrieb

tests: delete `cat-and-grep-sanity-check`

Part of rust-lang#121876.

All remaining `Makefile`s have open PRs that do not rely on platform `cat` or `grep` or the `cat-and-grep` script.
Add fixme and test for issue rust-lang#135289

This PR:
- adds a test minimizing issue rust-lang#135289 for PR rust-lang#135310
- adds a fixme about the suboptimal fix for the ICE

I've verified the test indeed ICEs with 3f2f695 reverted.

r? `@estebank`
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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 Jan 21, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

bors commented Jan 21, 2025

📌 Commit a7408c4 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 Jan 21, 2025
@bors
Copy link
Collaborator

bors commented Jan 22, 2025

⌛ Testing commit a7408c4 with merge c234b83...

@bors
Copy link
Collaborator

bors commented Jan 22, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 22, 2025
@bors bors merged commit c234b83 into rust-lang:master Jan 22, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 22, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#132232 CI: build FreeBSD artifacts on FreeBSD 13.4 30551685d2e90a3019c830b9f8b2be3d546cf95b (link)
#135706 Move supertrait_def_ids into the elaborate module like al… 92c2742811158d838f6e30279c149188d936c077 (link)
#135750 Add an example of using carrying_mul_add to write wider m… 6c41997adb87d621ec7cdc453bcef6c92bd29851 (link)
#135793 Ignore mermaid.min.js 26af33eb762c9c4b995855703b945d2a821aa42d (link)
#135810 Add Kobzol on vacation abad4ff533f63e8dac48ea4215aac82ba4a7d6e0 (link)
#135821 fix OsString::from_encoded_bytes_unchecked description 71ae0a446380a1a8c1f4a7643c90acac816fa850 (link)
#135824 tests: delete cat-and-grep-sanity-check 9b5eaae13144484154fe2c879ffe533b6a20693a (link)
#135833 Add fixme and test for issue #135289 9364bbcd28fee2616ac9297370670640a2bd423d (link)

previous master: a24bdc60ce

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
Copy link
Collaborator

Finished benchmarking commit (c234b83): 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 (primary 1.8%, secondary 1.3%)

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)
1.8% [1.3%, 2.5%] 3
Regressions ❌
(secondary)
1.4% [1.0%, 1.7%] 10
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.5% [-0.5%, -0.5%] 1
All ❌✅ (primary) 1.8% [1.3%, 2.5%] 3

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: 763.897s -> 764.55s (0.09%)
Artifact size: 325.99 MiB -> 326.05 MiB (0.02%)

@matthiaskrgr matthiaskrgr deleted the rollup-sftciqm branch January 25, 2025 09:13
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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
Development

Successfully merging this pull request may close these issues.