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 2 pull requests #124489

Merged
merged 7 commits into from
Apr 28, 2024
Merged

Rollup of 2 pull requests #124489

merged 7 commits into from
Apr 28, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Urgau and others added 7 commits April 28, 2024 17:17
…, r=notriddle

Inline more svg images into CSS

Follow-up of rust-lang#123706.

r? `@notriddle`
Port `print-cfg` run-make test to Rust-based rmake.rs

This PR port the `print-cfg` run-make test to Rust-based rmake.rs tests.

The actual test is now split in two:
 - the first part for the `--print=cfg` part
 - and the second part for the `=PATH` part of `--print`

Part of rust-lang#121876.

r? `@jieyouxu`
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 28, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=2

@bors
Copy link
Contributor

bors commented Apr 28, 2024

📌 Commit 6edb721 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 Apr 28, 2024
@bors
Copy link
Contributor

bors commented Apr 28, 2024

⌛ Testing commit 6edb721 with merge 10505a1...

@bors
Copy link
Contributor

bors commented Apr 28, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 28, 2024
@bors bors merged commit 10505a1 into rust-lang:master Apr 28, 2024
11 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Apr 28, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#123734 Inline more svg images into CSS c9feda6500e32040eaccad7d9f1b1726b59f8980 (link)
#124473 Port print-cfg run-make test to Rust-based rmake.rs ba6285d1d06ac0c46b20373f96fa98aa3550c022 (link)

previous master: ce609db948

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 (10505a1): 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)

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

Cycles

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

Binary size

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

Bootstrap: 673.364s -> 673.47s (0.02%)
Artifact size: 315.95 MiB -> 315.96 MiB (0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-7pa86bf branch September 1, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants