Skip to content

Rollup of 4 pull requests #106336

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 9 commits into from
Jan 1, 2023
Merged

Rollup of 4 pull requests #106336

merged 9 commits into from
Jan 1, 2023
+48 −13

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Ezrashaw and others added 9 commits December 30, 2022 14:24
@Ezrashaw
docs: add link to Path::join in PathBuf::push

Unverified

This user has not yet uploaded their public signing key.
GPG key ID: 17CD5C2ADAE0D344
Learn about vigilant mode
2c4ecff
@notriddle
rustdoc: merge scrape-help CSS
ac0bb74
@GuillaumeGomez
Add comment explaining what the GUI scrape-examples-fonts test is about
b542f28
@ehuss
Fix tidy unittest.
4620f82
@ehuss
Run cargo test on tidy itself.
59b80f5
@matthiaskrgr
Rollup merge of rust-lang#106280 - Ezrashaw:path-join-docs-better, r=…

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
4bf9cae 
…thomcc

docs: add link to `Path::join` in `PathBuf::push`

Fixes rust-lang#106219

Hopefully my wording is alright.
@matthiaskrgr
Rollup merge of rust-lang#106297 - notriddle:notriddle/scrape-help, r…

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
17263f2 
…=GuillaumeGomez

rustdoc: merge scrape-help CSS
@matthiaskrgr
Rollup merge of rust-lang#106328 - GuillaumeGomez:gui-test-explanatio…

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
0a08ab1 
…n, r=notriddle

Add comment explaining what the GUI scrape-examples-fonts test is about

r? `@notriddle`
@matthiaskrgr
Rollup merge of rust-lang#106334 - ehuss:fix-tidy-unittests, r=jyn514

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
0b3c3c9 
Fix tidy unittest.

The tidy unittests weren't compiling due to a change made a long while ago to the `Version` type.
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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-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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Dec 31, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented Dec 31, 2022

📌 Commit 0b3c3c9 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 Dec 31, 2022
@bors
Copy link
Collaborator

bors commented Dec 31, 2022

⌛ Testing commit 0b3c3c9 with merge c9825f7...

@bors
Copy link
Collaborator

bors commented Jan 1, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 1, 2023
@bors bors merged commit c9825f7 into rust-lang:master Jan 1, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 1, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#106334 d7e0c9b06c1939acfbf944d9f12484f8135c47b8
#106328 176d0036dec6f6ebe1da55440cab7231281e488c
#106297 6733f7297f278ee4bedf1c61f3d9bc63482c7353
#106280 c09753a1ccc1e291f8872542ec8d508777df57bc

previous master: 574b64a97f

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

@bors bors mentioned this pull request Jan 1, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c9825f7): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

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

Cycles

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

@matthiaskrgr matthiaskrgr deleted the rollup-4p6bgwf branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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-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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@matthiaskrgr @bors @rust-timer @rustbot @Ezrashaw @notriddle @GuillaumeGomez @ehuss