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 #110101

Merged
merged 13 commits into from
Apr 9, 2023
Merged

Rollup of 6 pull requests #110101

merged 13 commits into from
Apr 9, 2023

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkin and others added 13 commits April 7, 2023 18:36
This commit:
fcb2a36 (Rename `config.toml.example` to `config.example.toml`, 2023-03-11)
missed an instance in `config.example.toml` itself.
fix in plugin.md

fmt
Make the "codegen" profile of `config.toml` download and build llvm from source.

The stated purpose of the codegen profile in config.toml is:

> `# These defaults are meant for contributors to the compiler who modify codegen or LLVM`

but `download-ci-llvm` must be set to be false for the llvm source to even be downloaded. This patch adds that in.

Also included: a small docs fix in `config.example.toml`
Add `max_line_length` to `.editorconfig`, matching rustfmt

Add `max_line_length` to `.editorconfig`, matching the max width used by rustfmt.
…g, r=Nilstrieb

Tweak tuple indexing suggestion

Fixes rust-lang#110091
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-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 Apr 9, 2023
@JohnTitor
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Apr 9, 2023

📌 Commit eed27ac has been approved by JohnTitor

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

bors commented Apr 9, 2023

⌛ Testing commit eed27ac with merge 7cd6f55...

@bors
Copy link
Contributor

bors commented Apr 9, 2023

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 7cd6f55 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 9, 2023
@bors bors merged commit 7cd6f55 into rust-lang:master Apr 9, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 9, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#110096 25570b98e4aab866f82b0cb96ed43a5dbcac484c
#110086 860ee2d6dd279e290283918b1388097e679aa20f
#110074 9c9e4ca411392c94603a4199017bde5d9d8a768c
#110060 f15cbd70d9a22dd6917778556ce6aa3949eb7247
#110059 e817844589ca1cb261ced7db800529e87f95b6d3
#110058 7beb5848e1e7250ca2e55272dd57db5bcc636dcd

previous master: 0030465bcc

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

@JohnTitor JohnTitor deleted the rollup-ol20aw7 branch April 9, 2023 07:45
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (7cd6f55): 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

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

Cycles

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-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.

8 participants