Skip to content

Rollup of 5 pull requests #110598

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

Merged
merged 11 commits into from
Apr 20, 2023
Merged

Rollup of 5 pull requests #110598

merged 11 commits into from
Apr 20, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

beetrees and others added 11 commits April 12, 2023 16:21
…s, r=Mark-Simulacrum

Add `indent_style = tab` for `Makefile`s to `.editorconfig`

Add `indent_style = tab` for `Makefile`s to `.editorconfig` as spaces don't work as indents in Makefiles.
…jgillot

Add `GenericArgKind::as_{type,const,region}`

This allows to make code nicer in some cases
…, r=albertlarsan68

 fix out-of-date comment about rpath in bootstrap

in rust-lang#64316   (rust-lang@1bec962),  the `RUSTC_RPATH`  enviroment variables had been removed , but the comments about the rpath still keep it
this PR fix it  to avoid misunstanding
Style fix for loongarch-linux.md

Currently the render result by mdbook has some problems.
![]()
![Screenshot_2023-04-20-13-59-53-024_com android chrome-edit](https://user-images.githubusercontent.com/10987206/233272178-5850ae44-cb5e-4bc1-af3e-ed67f3fdb41f.jpg)
…oli-obk

Allow overwriting the sysroot compile flag in compile tests

This was added in https://github.com/rust-lang/rust/pull/110478/files#diff-03a0567fa80ca04ed5a55f9ac5c711b4f84659be2d0ac4a984196d581c04f76b, unconditionally passing the `sysroot` flag to the compile test invocations. In our ferrocene fork we have a few tests that test the `sysroot` flag specifically which fail due to the flag being passed multiple times now.

We believe upstreaming this small change could be beneficial should the rust-lang/rust also want to test certain sysroot setups in the future.
@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. rollup A PR which is a rollup labels Apr 20, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 20, 2023

📌 Commit 56d08d1 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 20, 2023
@bors
Copy link
Collaborator

bors commented Apr 20, 2023

⌛ Testing commit 56d08d1 with merge 791a7f2...

@bors
Copy link
Collaborator

bors commented Apr 20, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 20, 2023
@bors bors merged commit 791a7f2 into rust-lang:master Apr 20, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 20, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#110584 f76a051f7d4b89e90013c4260b2b9207f35f66da
#110581 a920fb4a775774501c442cff5ee57f39fc77964a
#110574 2b539111195bae81bcd7290596ffb82468d5bac6
#110545 78789f00858874ec0623c50fddfebbbaa48adbc6
#110240 bce399dbf0d4e4935220665cbe414fd469952a56

previous master: 7e23d180c1

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 (791a7f2): 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)
- - 0
Improvements ✅
(primary)
-3.0% [-3.9%, -2.2%] 2
Improvements ✅
(secondary)
-2.3% [-2.3%, -2.3%] 1
All ❌✅ (primary) -3.0% [-3.9%, -2.2%] 2

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

@matthiaskrgr matthiaskrgr deleted the rollup-0ybd9i3 branch March 16, 2024 18:18
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants