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

Merged
merged 16 commits into from
Jul 29, 2023
Merged

Rollup of 7 pull requests #114197

merged 16 commits into from
Jul 29, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jyn514 and others added 16 commits July 26, 2023 14:43
proc-macros are processed early in the compiler pipeline. There is no
need to involve codegen. So change to check-pass.

I have also looked through each changed test and to me it is
sufficiently clear that codegen is not needed for the purpose of the
test.

I skipped changing tests/ui/proc-macro/no-missing-docs.rs in this commit
because it was not clear to me that it can be changed to check-pass.
Not useful, for there is just a single example
…=cjgillot

Don't attempt to compute layout of type referencing error

Leads to more ICEs and strange diagnostics than are worth it.

Fixes rust-lang#113760
Prevent people from assigning me as a PR reviewer

depends on rust-lang/triagebot#1712
tests/ui/proc-macro/*: Migrate FIXMEs to check-pass

proc-macros are processed early in the compiler pipeline. There is no need to involve codegen. So change to check-pass.

I have also looked through each changed test and to me it is sufficiently clear that codegen is not needed for the purpose of the test.

I skipped changing `tests/ui/proc-macro/no-missing-docs.rs` in this commit because it was not clear to me that it can be changed to check-pass.

Part of rust-lang#62277
…est, r=workingjubilee

Fix switch-stdout test for none unix/windows platforms

PR rust-lang#112390 moved tests to std. Unfortunately, there is a typo which causes issues on platforms other than unix and windows.
…g_test, r=workingjubilee

Fix issue_15149 test for the SGX target

PR rust-lang#112390 moved tests to std. Unfortunately, this caused the `issue_15149` test to be enabled for the SGX target. This is incorrect as the SGX target does not support the `env::current_exe()` call.
btree/map.rs: remove "Basic usage" text

Not useful, for there is just a single example
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jul 29, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Jul 29, 2023

📌 Commit c6c1008 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 Jul 29, 2023
@bors
Copy link
Contributor

bors commented Jul 29, 2023

⌛ Testing commit c6c1008 with merge 5ed61a4...

@bors
Copy link
Contributor

bors commented Jul 29, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 29, 2023
@bors bors merged commit 5ed61a4 into rust-lang:master Jul 29, 2023
11 checks passed
@rustbot rustbot added this to the 1.73.0 milestone Jul 29, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#113773 Don't attempt to compute layout of type referencing error 3d559055fbaee1dac561c677eb226f8c5c42eca4 (link)
#114107 Prevent people from assigning me as a PR reviewer c1c5120fd672da55604d0bdebde37e906400eb2e (link)
#114124 tests/ui/proc-macro/*: Migrate FIXMEs to check-pass 4234cdd56a2b3d2e1b30382b8cff37be9c83c888 (link)
#114171 Fix switch-stdout test for none unix/windows platforms ea6d97eca5a3b38b48d281b084a0cfff7fb9c2a4 (link)
#114172 Fix issue_15149 test for the SGX target 400f8a986b23ff30201c83166ab35e673a72fece (link)
#114173 btree/map.rs: remove "Basic usage" text 598ef865c4263de2d6b45a12cce8ad54099eca5d (link)
#114174 doc: replace wrong punctuation mark d3bbb7be583d9b2b11c6e479f832ed9e24aa7225 (link)

previous master: 4734ac0943

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 (5ed61a4): 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.6% [0.6%, 0.6%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.6% [-3.6%, -3.6%] 1
Improvements ✅
(secondary)
-1.6% [-1.6%, -1.6%] 1
All ❌✅ (primary) -1.5% [-3.6%, 0.6%] 2

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: 650.829s -> 650.158s (-0.10%)

@matthiaskrgr matthiaskrgr deleted the rollup-iluf7u4 branch March 16, 2024 18:19
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 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-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. 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.

9 participants