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 7 pull requests #116054

Merged
merged 22 commits into from
Sep 22, 2023
Merged

Rollup of 7 pull requests #116054

merged 22 commits into from
Sep 22, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 22 commits August 24, 2023 08:08
Co-authored-by: Marcin S. <marcin@realemail.net>
We only want the attribute for the attribute revision.
To make failing tests easier to debug with --emit=mir, etc.
… r=m-ou-se

Command: also print removed env vars

There is no real shell syntax for unsetting an env var so easily, so we have to make one up. But we already do that for showing the 'program' name so I hope that's okay here, too. No strong opinion on what that should look like, I went with `unset(VAR_NAME)` for now.
…tcase, r=estebank

add UI test for delimiter errors

Fixes rust-lang#98601
from rust-lang#98601 (comment)
r? `@estebank`
tests/ui: Split large_moves.rs and move to lint/large_assignments

To make failing tests easier to debug with `--emit=mir`, etc.

Don't bother with `revisions: attribute option` for both tests though. Seems sufficient to just have that on one of the tests.

`git show -M --find-renames=40%` makes the diff easier to review. Or note that before this change we had one test with 4 errors, now we have 2 tests with 2 errors each.

r? `@oli-obk`

Part of rust-lang#83518
…-bug, r=cuviper

Fall back to _SC_NPROCESSORS_ONLN if sched_getaffinity returns an empty mask

Followup to rust-lang#115946
A gentler fix for rust-lang#115868, one that doesn't panic, [suggested on zulip](https://rust-lang.zulipchat.com/#narrow/stream/259402-t-libs.2Fmeetings/topic/Meeting.202023-09-19/near/391942927)

In that situation - on the buggy kernel versions - a zero-mask means no affinities have been set so `_SC_NPROCESSORS_ONLN` provides the right value.
…rrors

Account for nested `impl Trait` in TAIT

Fix rust-lang#116031.

r? `@compiler-errors`
…Jung

Add note to `is_known_rigid`

Adds a note requested by `@RalfJung` in rust-lang#114941 (comment)

Let me know if there are any other fns that need documentation, I could throw them into this PR too :)
give FutureIncompatibilityReason variants more explicit names

Also make the `reason` field mandatory when declaring a lint, to make sure this is a deliberate decision.
@rustbot rustbot added O-unix Operating system: Unix-like S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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 Sep 22, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Sep 22, 2023

📌 Commit 1a18ec0 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 22, 2023
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 22, 2023
@bors
Copy link
Contributor

bors commented Sep 22, 2023

⌛ Testing commit 1a18ec0 with merge 03c199a...

@bors
Copy link
Contributor

bors commented Sep 22, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 22, 2023
@bors bors merged commit 03c199a into rust-lang:master Sep 22, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 22, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#114379 Command: also print removed env vars daa60e59f016375bf97f03ddfb2a31c35f9cff65 (link)
#116034 add UI test for delimiter errors 32f1574f20514c931f4c71ad36698d3d140cf43e (link)
#116036 tests/ui: Split large_moves.rs and move to lint/large_assig… 1370204649f520ea8f1eaeba03f14cce8c2bef91 (link)
#116038 Fall back to _SC_NPROCESSORS_ONLN if sched_getaffinity retu… 54d5a0ee924b007579298ff35e53797a0ad7d5a4 (link)
#116039 Account for nested impl Trait in TAIT 3b5ae083431c8df50b70fb5806e23c5671bd4b45 (link)
#116041 Add note to is_known_rigid c27224168dec0404a1c35540717cd1cae0123a64 (link)
#116049 give FutureIncompatibilityReason variants more explicit nam… 4b1d9895b7b26b7e8aaa930c8648cdfbc97cde26 (link)

previous master: 5a4e47ebed

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 (03c199a): 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)
- - 0
Improvements ✅
(secondary)
-2.9% [-3.8%, -1.4%] 3
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 633.83s -> 634.55s (0.11%)
Artifact size: 317.58 MiB -> 317.65 MiB (0.02%)

@matthiaskrgr matthiaskrgr deleted the rollup-3pusno6 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
merged-by-bors This PR was explicitly merged by bors. O-unix Operating system: Unix-like 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-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.

10 participants