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.

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

Rollup of 6 pull requests #132722

Merged
merged 12 commits into from
Nov 7, 2024
Merged

Rollup of 6 pull requests #132722

merged 12 commits into from
Nov 7, 2024

Conversation

joboet
Copy link
Member

@joboet joboet commented Nov 7, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 12 commits November 4, 2024 07:50
Otherwise the tests would fail depending on the execution environment.
Signed-off-by: Xinye <[email protected]>
It was renamed to "main" from "master".
…wiser

miri: update ABI compat checks to accept Option-like types

This implements the t-lang decision described [here](rust-lang#130628 (comment)).

Fixes rust-lang/miri#3983
…d-to-find-python-executable, r=jieyouxu

fix(x): fix a regex used to find python executable

Isn't the regex `^python[2-3]\.[0-9]\+$` wrong? It doesn't match, for example, with `python2.8`. There should be a plus sign at the end for a match, like `python2.8+`. I think `[0-9]+` is meant here instead of `[0-9]\+`. In that case a string like `python2.8` would match. This wasn't noticed because the script probably find and run the Python executable before this line.
…r=jieyouxu

Add --diagnostic-width to some tests failing after 1a0c502

Otherwise the tests would fail depending on the execution environment.
…rieb

fix `LazyLock::get` and `LazyLock::get_mut` document
…fix-branch-name, r=tgross35

chore(issue-template): fix branch name

It was renamed to "main" from "master".

It might seem not important (actually it is not important) but I think there is no need to see this every time when we clicked this link:

![image](https://github.com/user-attachments/assets/145dc587-c365-47e6-83da-69c17f409f71)

And this way is faster I guess.
@rustbot rustbot added 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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Nov 7, 2024
@joboet
Copy link
Member Author

joboet commented Nov 7, 2024

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Nov 7, 2024

📌 Commit 194ce89 has been approved by joboet

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 7, 2024
@bors
Copy link
Contributor

bors commented Nov 7, 2024

⌛ Testing commit 194ce89 with merge 3d1dba8...

@bors
Copy link
Contributor

bors commented Nov 7, 2024

☀️ Test successful - checks-actions
Approved by: joboet
Pushing 3d1dba8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 7, 2024
@bors bors merged commit 3d1dba8 into rust-lang:master Nov 7, 2024
7 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 7, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#132057 miri: update ABI compat checks to accept Option-like types d95060a11bf94bc8eadc5644cfc957a73d09eaab (link)
#132665 Implement div_ceil for NonZero<unsigned> ea5b093a4048468670ab9700490b2a4d96fcf3af (link)
#132694 fix(x): fix a regex used to find python executable aaf1e2deb9252fe2aa8e91d6ceb10c82fe55831f (link)
#132707 Add --diagnostic-width to some tests failing after 1a0c502 b31576f2963829a3538f9189b2a1bb7f52a3df0c (link)
#132715 fix LazyLock::get and LazyLock::get_mut document 6f413c6f9c3bf97c7a21c0aa1e3f0d65cdea93b2 (link)
#132716 chore(issue-template): fix branch name 50a7067542db3abc42c5a321e32e0568f09cc7a1 (link)

previous master: fe43131683

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

@joboet joboet deleted the rollup-0q67jyo branch November 7, 2024 15:42
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3d1dba8): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
0.1% [0.1%, 0.1%] 1
Regressions ❌
(secondary)
1.4% [1.4%, 1.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.1% [0.1%, 0.1%] 1

Max RSS (memory usage)

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

Cycles

Results (secondary -1.8%)

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

Binary size

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

Bootstrap: 781.131s -> 780.704s (-0.05%)
Artifact size: 335.23 MiB -> 335.27 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-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.

8 participants