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 8 pull requests #131662

Merged
merged 17 commits into from
Oct 14, 2024
Merged

Rollup of 8 pull requests #131662

merged 17 commits into from
Oct 14, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

lolbinarycat and others added 17 commits September 14, 2024 12:02
…bertlarsan68

don't warn about a missing change-id in CI

fixes rust-lang#130352
…ersion, r=albertlarsan68

Do not output () on empty description

When passing an explicitly empty description string, as explained here https://github.com/rust-lang/rust/blob/master/config.example.toml#L611-L613, my expectation is that the resulting rustc will be compatible with upstream.

However, it seems that instead, a `()` is added to the end of the version string, causing the version compatibility check to fail. My proposed fix here would be to instead only print `({description})` if `description` is a non-empty string.
… r=albertlarsan68

Fix std_detect links

This PR aims to fix this issue: rust-lang#96506

Fixes rust-lang#96506
Clean up some Miri things in `sys/windows`

- remove miri hack that is only needed for win7 (we don't support win7 as a target in Miri)
- remove outdated comment now that Miri is on CI
…boet

sys/unix: add comments for some Miri fallbacks
…r=fee1-dead

Remove const trait bound modifier hack

It's no longer necessary, according to the test suite :D

r? `@fee1-dead` or anyone really
…an68

enable `download_ci_llvm` test

This was ignored because it caused merge failures on [LLVM update PR](rust-lang#131448). The issue was not checking `is_ci_llvm_available` in the test which is crucial for enabling CI LLVM:

https://github.com/rust-lang/rust/blob/2aa26d8a722cf8810b27538c24b93d29324d4ac7/src/bootstrap/src/core/config/config.rs#L2835-L2844
@rustbot rustbot added O-unix Operating system: Unix-like O-windows Operating system: Windows 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 Oct 13, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Oct 13, 2024

📌 Commit 0e00a70 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 Oct 13, 2024
@bors
Copy link
Contributor

bors commented Oct 13, 2024

⌛ Testing commit 0e00a70 with merge 47017dd...

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 13, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#130356 (don't warn about a missing change-id in CI)
 - rust-lang#130900 (Do not output () on empty description)
 - rust-lang#131066 (Add the Chinese translation entry to the RustByExample build process)
 - rust-lang#131067 (Fix std_detect links)
 - rust-lang#131644 (Clean up some Miri things in `sys/windows`)
 - rust-lang#131646 (sys/unix: add comments for some Miri fallbacks)
 - rust-lang#131653 (Remove const trait bound modifier hack)
 - rust-lang#131659 (enable `download_ci_llvm` test)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Oct 13, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 13, 2024
@matthiaskrgr
Copy link
Member Author

@bors retry

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

bors commented Oct 13, 2024

⌛ Testing commit 0e00a70 with merge 5ceb623...

@bors
Copy link
Contributor

bors commented Oct 14, 2024

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

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#130356 don't warn about a missing change-id in CI 4e4c54e7a7d03dfc96301cb6cb42e6e257ec8fe0 (link)
#130900 Do not output () on empty description 02706db4499b240ed7538b9374a16f82470259b2 (link)
#131066 Add the Chinese translation entry to the RustByExample buil… 1d44da52ce73e86f110ced462b74626cda828849 (link)
#131067 Fix std_detect links 6614ceb90d85d9d44f4cc55a7ab935d5d3c79a9b (link)
#131644 Clean up some Miri things in sys/windows 0c5bc4c0f8143bbe47b7c23c1d5e7c0c5934dd1c (link)
#131646 sys/unix: add comments for some Miri fallbacks b99c9bc6d1fe524f6888814aa91abefa5f22aaf9 (link)
#131653 Remove const trait bound modifier hack 1640fce32f717d5d6af016a5a4d3100e6639eea4 (link)
#131659 enable download_ci_llvm test 36337a709ef931b0b550e6a57fb309aad8dff0f5 (link)

previous master: 27861c429a

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 (5ceb623): comparison URL.

Overall result: ✅ improvements - 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
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.9% [-1.9%, -1.9%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 1.4%)

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.4% [1.1%, 1.7%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.4% [1.1%, 1.7%] 2

Cycles

Results (secondary -1.2%)

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)
2.2% [2.2%, 2.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.9% [-3.4%, -2.5%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 782.891s -> 782.102s (-0.10%)
Artifact size: 332.14 MiB -> 332.13 MiB (-0.00%)

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. O-unix Operating system: Unix-like O-windows Operating system: Windows 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.