Group rfcs tests - #112071

Merged
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests
Jun 5, 2023
Merged

Group rfcs tests#112071
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests

Conversation

@WaffleLapkin

Copy link
Copy Markdown
Member

This moves all RFC tests to tests/ui/rfcs/rfc-NNNN-title-title-title/...

I had to rename some tests due to conflicts, but otherwise this is just a move.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added 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. labels May 29, 2023
@oli-obk

Copy link
Copy Markdown
Contributor

r=me after a rebase

@bors rollup

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented May 30, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit b694a03 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 May 30, 2023
@Dylan-DPCDylan-DPC mentioned this pull request May 30, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 30, 2023
…li-obk
Group rfcs tests
This moves all RFC tests to `tests/ui/rfcs/rfc-NNNN-title-title-title/...`
I had to rename some tests due to conflicts, but otherwise this is just a move.
@Dylan-DPCDylan-DPC mentioned this pull request Jun 1, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2023
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr

Copy link
Copy Markdown
Member

@bors rollup=never prone to merge conflicts

@bors

bors commented Jun 2, 2023

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout group-rfcs-tests(switch to your branch)
  2. git fetch upstream master(retrieve the latest master)
  3. git rebase upstream/master -p(rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self group-rfcs-tests --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing tests/ui/rfc-2005-default-binding-mode/slice.rs
Removing tests/ui/rfc-2005-default-binding-mode/lit.rs
Removing tests/ui/rfc-2005-default-binding-mode/for.rs
Removing tests/ui/rfc-2005-default-binding-mode/enum.rs
Auto-merging src/tools/tidy/src/ui_tests.rs
CONFLICT (content): Merge conflict in src/tools/tidy/src/ui_tests.rs
Automatic merge failed; fix conflicts and then commit the result.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 2, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

I don't think this is an improvement, the rfcs directory is artificial, meaningless by itself, and doesn't map to a WG or a set of people that work on a specific compiler area and could maintain the corresponding subset of tests.

I think specific rfc-NNNN-feature-name subdirectories should be moved to "semantically meaningful" subdirectories like privacy, or lexer, or auto-traits or whatever.

cc #73494

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@petrochenkov I agree that rfcs/ does not make much sense in the long run and we should sort things better, however in the meantime it makes sense to use the same style for all RFCs, even if eventually we won't have rfc-specific directories at all.

@bors r=oli-obk

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 18e016f has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 5, 2023
@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 18e016f with merge e6d4725...

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing e6d4725 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2023
@bors
bors merged commit e6d4725 into rust-lang:masterJun 5, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 5, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e6d4725): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
5.4%[5.4%, 5.4%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)--0

Max RSS (memory usage)

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

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: 645.696s -> 647.875s (0.34%)

@rustbotrustbot added the perf-regression Performance regression. label Jun 5, 2023
@Mark-SimulacrumMark-Simulacrum removed the perf-regression Performance regression. label Jun 6, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

@WaffleLapkin
It's not useful in a short turn either, it only creates churn in git history and adds one more directory to the list of meaningless directories to be dismantled.
Reverting this doesn't make sense because that would only add more churn, but I wish I r- this PR more explicitly to prevent it from landing.
Please, do not move any more tests mechanically, like in this PR.

It's not necessary to dismantle the rfc-NNNN-feature-name directories immediately, they can be moved to meaningful subdirectories as whole too.

@WaffleLapkin
WaffleLapkin deleted the group-rfcs-tests branch June 8, 2023 12:28
@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

adds one more directory to the list of meaningless directories to be dismantled.

rfcs/ already existed, so this does not change the list.

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 30, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant 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.

8 participants

@WaffleLapkin@rustbot@oli-obk@bors@matthiaskrgr@petrochenkov@rust-timer@Mark-Simulacrum
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Group rfcs tests - #112071

Merged
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests
Jun 5, 2023
Merged

Group rfcs tests#112071
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests

Conversation

@WaffleLapkin

Copy link
Copy Markdown
Member

This moves all RFC tests to tests/ui/rfcs/rfc-NNNN-title-title-title/...

I had to rename some tests due to conflicts, but otherwise this is just a move.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added 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. labels May 29, 2023
@oli-obk

Copy link
Copy Markdown
Contributor

r=me after a rebase

@bors rollup

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented May 30, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit b694a03 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 May 30, 2023
@Dylan-DPCDylan-DPC mentioned this pull request May 30, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 30, 2023
…li-obk
Group rfcs tests
This moves all RFC tests to `tests/ui/rfcs/rfc-NNNN-title-title-title/...`
I had to rename some tests due to conflicts, but otherwise this is just a move.
@Dylan-DPCDylan-DPC mentioned this pull request Jun 1, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2023
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr

Copy link
Copy Markdown
Member

@bors rollup=never prone to merge conflicts

@bors

bors commented Jun 2, 2023

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout group-rfcs-tests(switch to your branch)
  2. git fetch upstream master(retrieve the latest master)
  3. git rebase upstream/master -p(rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self group-rfcs-tests --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing tests/ui/rfc-2005-default-binding-mode/slice.rs
Removing tests/ui/rfc-2005-default-binding-mode/lit.rs
Removing tests/ui/rfc-2005-default-binding-mode/for.rs
Removing tests/ui/rfc-2005-default-binding-mode/enum.rs
Auto-merging src/tools/tidy/src/ui_tests.rs
CONFLICT (content): Merge conflict in src/tools/tidy/src/ui_tests.rs
Automatic merge failed; fix conflicts and then commit the result.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 2, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

I don't think this is an improvement, the rfcs directory is artificial, meaningless by itself, and doesn't map to a WG or a set of people that work on a specific compiler area and could maintain the corresponding subset of tests.

I think specific rfc-NNNN-feature-name subdirectories should be moved to "semantically meaningful" subdirectories like privacy, or lexer, or auto-traits or whatever.

cc #73494

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@petrochenkov I agree that rfcs/ does not make much sense in the long run and we should sort things better, however in the meantime it makes sense to use the same style for all RFCs, even if eventually we won't have rfc-specific directories at all.

@bors r=oli-obk

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 18e016f has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 5, 2023
@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 18e016f with merge e6d4725...

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing e6d4725 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2023
@bors
bors merged commit e6d4725 into rust-lang:masterJun 5, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 5, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e6d4725): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
5.4%[5.4%, 5.4%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)--0

Max RSS (memory usage)

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

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: 645.696s -> 647.875s (0.34%)

@rustbotrustbot added the perf-regression Performance regression. label Jun 5, 2023
@Mark-SimulacrumMark-Simulacrum removed the perf-regression Performance regression. label Jun 6, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

@WaffleLapkin
It's not useful in a short turn either, it only creates churn in git history and adds one more directory to the list of meaningless directories to be dismantled.
Reverting this doesn't make sense because that would only add more churn, but I wish I r- this PR more explicitly to prevent it from landing.
Please, do not move any more tests mechanically, like in this PR.

It's not necessary to dismantle the rfc-NNNN-feature-name directories immediately, they can be moved to meaningful subdirectories as whole too.

@WaffleLapkin
WaffleLapkin deleted the group-rfcs-tests branch June 8, 2023 12:28
@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

adds one more directory to the list of meaningless directories to be dismantled.

rfcs/ already existed, so this does not change the list.

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 30, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant 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.

8 participants

@WaffleLapkin@rustbot@oli-obk@bors@matthiaskrgr@petrochenkov@rust-timer@Mark-Simulacrum
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Group rfcs tests - #112071

Merged
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests
Jun 5, 2023
Merged

Group rfcs tests#112071
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests

Conversation

@WaffleLapkin

Copy link
Copy Markdown
Member

This moves all RFC tests to tests/ui/rfcs/rfc-NNNN-title-title-title/...

I had to rename some tests due to conflicts, but otherwise this is just a move.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added 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. labels May 29, 2023
@oli-obk

Copy link
Copy Markdown
Contributor

r=me after a rebase

@bors rollup

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented May 30, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit b694a03 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 May 30, 2023
@Dylan-DPCDylan-DPC mentioned this pull request May 30, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 30, 2023
…li-obk
Group rfcs tests
This moves all RFC tests to `tests/ui/rfcs/rfc-NNNN-title-title-title/...`
I had to rename some tests due to conflicts, but otherwise this is just a move.
@Dylan-DPCDylan-DPC mentioned this pull request Jun 1, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2023
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr

Copy link
Copy Markdown
Member

@bors rollup=never prone to merge conflicts

@bors

bors commented Jun 2, 2023

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout group-rfcs-tests(switch to your branch)
  2. git fetch upstream master(retrieve the latest master)
  3. git rebase upstream/master -p(rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self group-rfcs-tests --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing tests/ui/rfc-2005-default-binding-mode/slice.rs
Removing tests/ui/rfc-2005-default-binding-mode/lit.rs
Removing tests/ui/rfc-2005-default-binding-mode/for.rs
Removing tests/ui/rfc-2005-default-binding-mode/enum.rs
Auto-merging src/tools/tidy/src/ui_tests.rs
CONFLICT (content): Merge conflict in src/tools/tidy/src/ui_tests.rs
Automatic merge failed; fix conflicts and then commit the result.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 2, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

I don't think this is an improvement, the rfcs directory is artificial, meaningless by itself, and doesn't map to a WG or a set of people that work on a specific compiler area and could maintain the corresponding subset of tests.

I think specific rfc-NNNN-feature-name subdirectories should be moved to "semantically meaningful" subdirectories like privacy, or lexer, or auto-traits or whatever.

cc #73494

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@petrochenkov I agree that rfcs/ does not make much sense in the long run and we should sort things better, however in the meantime it makes sense to use the same style for all RFCs, even if eventually we won't have rfc-specific directories at all.

@bors r=oli-obk

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 18e016f has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 5, 2023
@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 18e016f with merge e6d4725...

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing e6d4725 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2023
@bors
bors merged commit e6d4725 into rust-lang:masterJun 5, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 5, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e6d4725): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
5.4%[5.4%, 5.4%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)--0

Max RSS (memory usage)

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

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: 645.696s -> 647.875s (0.34%)

@rustbotrustbot added the perf-regression Performance regression. label Jun 5, 2023
@Mark-SimulacrumMark-Simulacrum removed the perf-regression Performance regression. label Jun 6, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

@WaffleLapkin
It's not useful in a short turn either, it only creates churn in git history and adds one more directory to the list of meaningless directories to be dismantled.
Reverting this doesn't make sense because that would only add more churn, but I wish I r- this PR more explicitly to prevent it from landing.
Please, do not move any more tests mechanically, like in this PR.

It's not necessary to dismantle the rfc-NNNN-feature-name directories immediately, they can be moved to meaningful subdirectories as whole too.

@WaffleLapkin
WaffleLapkin deleted the group-rfcs-tests branch June 8, 2023 12:28
@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

adds one more directory to the list of meaningless directories to be dismantled.

rfcs/ already existed, so this does not change the list.

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 30, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant 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.

8 participants

@WaffleLapkin@rustbot@oli-obk@bors@matthiaskrgr@petrochenkov@rust-timer@Mark-Simulacrum
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Group rfcs tests - #112071

Merged
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests
Jun 5, 2023
Merged

Group rfcs tests#112071
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests

Conversation

@WaffleLapkin

Copy link
Copy Markdown
Member

This moves all RFC tests to tests/ui/rfcs/rfc-NNNN-title-title-title/...

I had to rename some tests due to conflicts, but otherwise this is just a move.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added 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. labels May 29, 2023
@oli-obk

Copy link
Copy Markdown
Contributor

r=me after a rebase

@bors rollup

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented May 30, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit b694a03 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 May 30, 2023
@Dylan-DPCDylan-DPC mentioned this pull request May 30, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 30, 2023
…li-obk
Group rfcs tests
This moves all RFC tests to `tests/ui/rfcs/rfc-NNNN-title-title-title/...`
I had to rename some tests due to conflicts, but otherwise this is just a move.
@Dylan-DPCDylan-DPC mentioned this pull request Jun 1, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2023
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr

Copy link
Copy Markdown
Member

@bors rollup=never prone to merge conflicts

@bors

bors commented Jun 2, 2023

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout group-rfcs-tests(switch to your branch)
  2. git fetch upstream master(retrieve the latest master)
  3. git rebase upstream/master -p(rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self group-rfcs-tests --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing tests/ui/rfc-2005-default-binding-mode/slice.rs
Removing tests/ui/rfc-2005-default-binding-mode/lit.rs
Removing tests/ui/rfc-2005-default-binding-mode/for.rs
Removing tests/ui/rfc-2005-default-binding-mode/enum.rs
Auto-merging src/tools/tidy/src/ui_tests.rs
CONFLICT (content): Merge conflict in src/tools/tidy/src/ui_tests.rs
Automatic merge failed; fix conflicts and then commit the result.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 2, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

I don't think this is an improvement, the rfcs directory is artificial, meaningless by itself, and doesn't map to a WG or a set of people that work on a specific compiler area and could maintain the corresponding subset of tests.

I think specific rfc-NNNN-feature-name subdirectories should be moved to "semantically meaningful" subdirectories like privacy, or lexer, or auto-traits or whatever.

cc #73494

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@petrochenkov I agree that rfcs/ does not make much sense in the long run and we should sort things better, however in the meantime it makes sense to use the same style for all RFCs, even if eventually we won't have rfc-specific directories at all.

@bors r=oli-obk

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 18e016f has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 5, 2023
@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 18e016f with merge e6d4725...

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing e6d4725 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2023
@bors
bors merged commit e6d4725 into rust-lang:masterJun 5, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 5, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e6d4725): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
5.4%[5.4%, 5.4%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)--0

Max RSS (memory usage)

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

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: 645.696s -> 647.875s (0.34%)

@rustbotrustbot added the perf-regression Performance regression. label Jun 5, 2023
@Mark-SimulacrumMark-Simulacrum removed the perf-regression Performance regression. label Jun 6, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

@WaffleLapkin
It's not useful in a short turn either, it only creates churn in git history and adds one more directory to the list of meaningless directories to be dismantled.
Reverting this doesn't make sense because that would only add more churn, but I wish I r- this PR more explicitly to prevent it from landing.
Please, do not move any more tests mechanically, like in this PR.

It's not necessary to dismantle the rfc-NNNN-feature-name directories immediately, they can be moved to meaningful subdirectories as whole too.

@WaffleLapkin
WaffleLapkin deleted the group-rfcs-tests branch June 8, 2023 12:28
@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

adds one more directory to the list of meaningless directories to be dismantled.

rfcs/ already existed, so this does not change the list.

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 30, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant 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.

8 participants

@WaffleLapkin@rustbot@oli-obk@bors@matthiaskrgr@petrochenkov@rust-timer@Mark-Simulacrum
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Group rfcs tests - #112071

Merged
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests
Jun 5, 2023
Merged

Group rfcs tests#112071
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests

Conversation

@WaffleLapkin

Copy link
Copy Markdown
Member

This moves all RFC tests to tests/ui/rfcs/rfc-NNNN-title-title-title/...

I had to rename some tests due to conflicts, but otherwise this is just a move.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added 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. labels May 29, 2023
@oli-obk

Copy link
Copy Markdown
Contributor

r=me after a rebase

@bors rollup

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented May 30, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit b694a03 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 May 30, 2023
@Dylan-DPCDylan-DPC mentioned this pull request May 30, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 30, 2023
…li-obk
Group rfcs tests
This moves all RFC tests to `tests/ui/rfcs/rfc-NNNN-title-title-title/...`
I had to rename some tests due to conflicts, but otherwise this is just a move.
@Dylan-DPCDylan-DPC mentioned this pull request Jun 1, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2023
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr

Copy link
Copy Markdown
Member

@bors rollup=never prone to merge conflicts

@bors

bors commented Jun 2, 2023

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout group-rfcs-tests(switch to your branch)
  2. git fetch upstream master(retrieve the latest master)
  3. git rebase upstream/master -p(rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self group-rfcs-tests --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing tests/ui/rfc-2005-default-binding-mode/slice.rs
Removing tests/ui/rfc-2005-default-binding-mode/lit.rs
Removing tests/ui/rfc-2005-default-binding-mode/for.rs
Removing tests/ui/rfc-2005-default-binding-mode/enum.rs
Auto-merging src/tools/tidy/src/ui_tests.rs
CONFLICT (content): Merge conflict in src/tools/tidy/src/ui_tests.rs
Automatic merge failed; fix conflicts and then commit the result.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 2, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

I don't think this is an improvement, the rfcs directory is artificial, meaningless by itself, and doesn't map to a WG or a set of people that work on a specific compiler area and could maintain the corresponding subset of tests.

I think specific rfc-NNNN-feature-name subdirectories should be moved to "semantically meaningful" subdirectories like privacy, or lexer, or auto-traits or whatever.

cc #73494

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@petrochenkov I agree that rfcs/ does not make much sense in the long run and we should sort things better, however in the meantime it makes sense to use the same style for all RFCs, even if eventually we won't have rfc-specific directories at all.

@bors r=oli-obk

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 18e016f has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 5, 2023
@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 18e016f with merge e6d4725...

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing e6d4725 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2023
@bors
bors merged commit e6d4725 into rust-lang:masterJun 5, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 5, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e6d4725): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
5.4%[5.4%, 5.4%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)--0

Max RSS (memory usage)

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

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: 645.696s -> 647.875s (0.34%)

@rustbotrustbot added the perf-regression Performance regression. label Jun 5, 2023
@Mark-SimulacrumMark-Simulacrum removed the perf-regression Performance regression. label Jun 6, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

@WaffleLapkin
It's not useful in a short turn either, it only creates churn in git history and adds one more directory to the list of meaningless directories to be dismantled.
Reverting this doesn't make sense because that would only add more churn, but I wish I r- this PR more explicitly to prevent it from landing.
Please, do not move any more tests mechanically, like in this PR.

It's not necessary to dismantle the rfc-NNNN-feature-name directories immediately, they can be moved to meaningful subdirectories as whole too.

@WaffleLapkin
WaffleLapkin deleted the group-rfcs-tests branch June 8, 2023 12:28
@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

adds one more directory to the list of meaningless directories to be dismantled.

rfcs/ already existed, so this does not change the list.

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 30, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant 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.

8 participants

@WaffleLapkin@rustbot@oli-obk@bors@matthiaskrgr@petrochenkov@rust-timer@Mark-Simulacrum
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Group rfcs tests - #112071

Merged
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests
Jun 5, 2023
Merged

Group rfcs tests#112071
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests

Conversation

@WaffleLapkin

Copy link
Copy Markdown
Member

This moves all RFC tests to tests/ui/rfcs/rfc-NNNN-title-title-title/...

I had to rename some tests due to conflicts, but otherwise this is just a move.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added 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. labels May 29, 2023
@oli-obk

Copy link
Copy Markdown
Contributor

r=me after a rebase

@bors rollup

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented May 30, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit b694a03 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 May 30, 2023
@Dylan-DPCDylan-DPC mentioned this pull request May 30, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 30, 2023
…li-obk
Group rfcs tests
This moves all RFC tests to `tests/ui/rfcs/rfc-NNNN-title-title-title/...`
I had to rename some tests due to conflicts, but otherwise this is just a move.
@Dylan-DPCDylan-DPC mentioned this pull request Jun 1, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2023
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr

Copy link
Copy Markdown
Member

@bors rollup=never prone to merge conflicts

@bors

bors commented Jun 2, 2023

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout group-rfcs-tests(switch to your branch)
  2. git fetch upstream master(retrieve the latest master)
  3. git rebase upstream/master -p(rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self group-rfcs-tests --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing tests/ui/rfc-2005-default-binding-mode/slice.rs
Removing tests/ui/rfc-2005-default-binding-mode/lit.rs
Removing tests/ui/rfc-2005-default-binding-mode/for.rs
Removing tests/ui/rfc-2005-default-binding-mode/enum.rs
Auto-merging src/tools/tidy/src/ui_tests.rs
CONFLICT (content): Merge conflict in src/tools/tidy/src/ui_tests.rs
Automatic merge failed; fix conflicts and then commit the result.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 2, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

I don't think this is an improvement, the rfcs directory is artificial, meaningless by itself, and doesn't map to a WG or a set of people that work on a specific compiler area and could maintain the corresponding subset of tests.

I think specific rfc-NNNN-feature-name subdirectories should be moved to "semantically meaningful" subdirectories like privacy, or lexer, or auto-traits or whatever.

cc #73494

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@petrochenkov I agree that rfcs/ does not make much sense in the long run and we should sort things better, however in the meantime it makes sense to use the same style for all RFCs, even if eventually we won't have rfc-specific directories at all.

@bors r=oli-obk

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 18e016f has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 5, 2023
@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 18e016f with merge e6d4725...

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing e6d4725 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2023
@bors
bors merged commit e6d4725 into rust-lang:masterJun 5, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 5, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e6d4725): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
5.4%[5.4%, 5.4%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)--0

Max RSS (memory usage)

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

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: 645.696s -> 647.875s (0.34%)

@rustbotrustbot added the perf-regression Performance regression. label Jun 5, 2023
@Mark-SimulacrumMark-Simulacrum removed the perf-regression Performance regression. label Jun 6, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

@WaffleLapkin
It's not useful in a short turn either, it only creates churn in git history and adds one more directory to the list of meaningless directories to be dismantled.
Reverting this doesn't make sense because that would only add more churn, but I wish I r- this PR more explicitly to prevent it from landing.
Please, do not move any more tests mechanically, like in this PR.

It's not necessary to dismantle the rfc-NNNN-feature-name directories immediately, they can be moved to meaningful subdirectories as whole too.

@WaffleLapkin
WaffleLapkin deleted the group-rfcs-tests branch June 8, 2023 12:28
@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

adds one more directory to the list of meaningless directories to be dismantled.

rfcs/ already existed, so this does not change the list.

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 30, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant 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.

8 participants

@WaffleLapkin@rustbot@oli-obk@bors@matthiaskrgr@petrochenkov@rust-timer@Mark-Simulacrum
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Group rfcs tests - #112071

Merged
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests
Jun 5, 2023
Merged

Group rfcs tests#112071
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests

Conversation

@WaffleLapkin

Copy link
Copy Markdown
Member

This moves all RFC tests to tests/ui/rfcs/rfc-NNNN-title-title-title/...

I had to rename some tests due to conflicts, but otherwise this is just a move.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added 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. labels May 29, 2023
@oli-obk

Copy link
Copy Markdown
Contributor

r=me after a rebase

@bors rollup

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented May 30, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit b694a03 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 May 30, 2023
@Dylan-DPCDylan-DPC mentioned this pull request May 30, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 30, 2023
…li-obk
Group rfcs tests
This moves all RFC tests to `tests/ui/rfcs/rfc-NNNN-title-title-title/...`
I had to rename some tests due to conflicts, but otherwise this is just a move.
@Dylan-DPCDylan-DPC mentioned this pull request Jun 1, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2023
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr

Copy link
Copy Markdown
Member

@bors rollup=never prone to merge conflicts

@bors

bors commented Jun 2, 2023

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout group-rfcs-tests(switch to your branch)
  2. git fetch upstream master(retrieve the latest master)
  3. git rebase upstream/master -p(rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self group-rfcs-tests --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing tests/ui/rfc-2005-default-binding-mode/slice.rs
Removing tests/ui/rfc-2005-default-binding-mode/lit.rs
Removing tests/ui/rfc-2005-default-binding-mode/for.rs
Removing tests/ui/rfc-2005-default-binding-mode/enum.rs
Auto-merging src/tools/tidy/src/ui_tests.rs
CONFLICT (content): Merge conflict in src/tools/tidy/src/ui_tests.rs
Automatic merge failed; fix conflicts and then commit the result.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 2, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

I don't think this is an improvement, the rfcs directory is artificial, meaningless by itself, and doesn't map to a WG or a set of people that work on a specific compiler area and could maintain the corresponding subset of tests.

I think specific rfc-NNNN-feature-name subdirectories should be moved to "semantically meaningful" subdirectories like privacy, or lexer, or auto-traits or whatever.

cc #73494

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@petrochenkov I agree that rfcs/ does not make much sense in the long run and we should sort things better, however in the meantime it makes sense to use the same style for all RFCs, even if eventually we won't have rfc-specific directories at all.

@bors r=oli-obk

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 18e016f has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 5, 2023
@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 18e016f with merge e6d4725...

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing e6d4725 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2023
@bors
bors merged commit e6d4725 into rust-lang:masterJun 5, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 5, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e6d4725): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
5.4%[5.4%, 5.4%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)--0

Max RSS (memory usage)

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

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: 645.696s -> 647.875s (0.34%)

@rustbotrustbot added the perf-regression Performance regression. label Jun 5, 2023
@Mark-SimulacrumMark-Simulacrum removed the perf-regression Performance regression. label Jun 6, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

@WaffleLapkin
It's not useful in a short turn either, it only creates churn in git history and adds one more directory to the list of meaningless directories to be dismantled.
Reverting this doesn't make sense because that would only add more churn, but I wish I r- this PR more explicitly to prevent it from landing.
Please, do not move any more tests mechanically, like in this PR.

It's not necessary to dismantle the rfc-NNNN-feature-name directories immediately, they can be moved to meaningful subdirectories as whole too.

@WaffleLapkin
WaffleLapkin deleted the group-rfcs-tests branch June 8, 2023 12:28
@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

adds one more directory to the list of meaningless directories to be dismantled.

rfcs/ already existed, so this does not change the list.

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 30, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant 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.

8 participants

@WaffleLapkin@rustbot@oli-obk@bors@matthiaskrgr@petrochenkov@rust-timer@Mark-Simulacrum
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Group rfcs tests - #112071

Merged
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests
Jun 5, 2023
Merged

Group rfcs tests#112071
bors merged 2 commits into
rust-lang:masterfrom
WaffleLapkin:group-rfcs-tests

Conversation

@WaffleLapkin

Copy link
Copy Markdown
Member

This moves all RFC tests to tests/ui/rfcs/rfc-NNNN-title-title-title/...

I had to rename some tests due to conflicts, but otherwise this is just a move.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added 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. labels May 29, 2023
@oli-obk

Copy link
Copy Markdown
Contributor

r=me after a rebase

@bors rollup

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented May 30, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit b694a03 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 May 30, 2023
@Dylan-DPCDylan-DPC mentioned this pull request May 30, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 30, 2023
…li-obk
Group rfcs tests
This moves all RFC tests to `tests/ui/rfcs/rfc-NNNN-title-title-title/...`
I had to rename some tests due to conflicts, but otherwise this is just a move.
@Dylan-DPCDylan-DPC mentioned this pull request Jun 1, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2023
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr

Copy link
Copy Markdown
Member

@bors rollup=never prone to merge conflicts

@bors

bors commented Jun 2, 2023

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout group-rfcs-tests(switch to your branch)
  2. git fetch upstream master(retrieve the latest master)
  3. git rebase upstream/master -p(rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self group-rfcs-tests --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing tests/ui/rfc-2005-default-binding-mode/slice.rs
Removing tests/ui/rfc-2005-default-binding-mode/lit.rs
Removing tests/ui/rfc-2005-default-binding-mode/for.rs
Removing tests/ui/rfc-2005-default-binding-mode/enum.rs
Auto-merging src/tools/tidy/src/ui_tests.rs
CONFLICT (content): Merge conflict in src/tools/tidy/src/ui_tests.rs
Automatic merge failed; fix conflicts and then commit the result.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 2, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

I don't think this is an improvement, the rfcs directory is artificial, meaningless by itself, and doesn't map to a WG or a set of people that work on a specific compiler area and could maintain the corresponding subset of tests.

I think specific rfc-NNNN-feature-name subdirectories should be moved to "semantically meaningful" subdirectories like privacy, or lexer, or auto-traits or whatever.

cc #73494

@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

@petrochenkov I agree that rfcs/ does not make much sense in the long run and we should sort things better, however in the meantime it makes sense to use the same style for all RFCs, even if eventually we won't have rfc-specific directories at all.

@bors r=oli-obk

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 18e016f has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 5, 2023
@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 18e016f with merge e6d4725...

@bors

bors commented Jun 5, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing e6d4725 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2023
@bors
bors merged commit e6d4725 into rust-lang:masterJun 5, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 5, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e6d4725): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
5.4%[5.4%, 5.4%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)--0

Max RSS (memory usage)

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

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: 645.696s -> 647.875s (0.34%)

@rustbotrustbot added the perf-regression Performance regression. label Jun 5, 2023
@Mark-SimulacrumMark-Simulacrum removed the perf-regression Performance regression. label Jun 6, 2023
@petrochenkov

Copy link
Copy Markdown
Contributor

@WaffleLapkin
It's not useful in a short turn either, it only creates churn in git history and adds one more directory to the list of meaningless directories to be dismantled.
Reverting this doesn't make sense because that would only add more churn, but I wish I r- this PR more explicitly to prevent it from landing.
Please, do not move any more tests mechanically, like in this PR.

It's not necessary to dismantle the rfc-NNNN-feature-name directories immediately, they can be moved to meaningful subdirectories as whole too.

@WaffleLapkin
WaffleLapkin deleted the group-rfcs-tests branch June 8, 2023 12:28
@WaffleLapkin

Copy link
Copy Markdown
MemberAuthor

adds one more directory to the list of meaningless directories to be dismantled.

rfcs/ already existed, so this does not change the list.

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 30, 2023
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant 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.

8 participants

@WaffleLapkin@rustbot@oli-obk@bors@matthiaskrgr@petrochenkov@rust-timer@Mark-Simulacrum