Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a label to struct/enum/union ident name #102314

Merged
merged 3 commits into from
Sep 27, 2022

Conversation

TaKO8Ki
Copy link
Member

@TaKO8Ki TaKO8Ki commented Sep 26, 2022

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 26, 2022
@rust-highfive
Copy link
Collaborator

r? @oli-obk

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 26, 2022
@TaKO8Ki TaKO8Ki force-pushed the add-label-to-struct-enum-union-ident branch from 8b50600 to 9d49d64 Compare September 26, 2022 14:57
@estebank
Copy link
Contributor

r? @estebank
@bors r+

@bors
Copy link
Contributor

bors commented Sep 26, 2022

📌 Commit 9d49d64 has been approved by estebank

It is now in the queue for this repository.

@rust-highfive rust-highfive assigned estebank and unassigned oli-obk Sep 26, 2022
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 26, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 26, 2022
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#101875 (Allow more `!Copy` impls)
 - rust-lang#101996 (Don't duplicate region names for late-bound regions in print of Binder)
 - rust-lang#102181 (Add regression test)
 - rust-lang#102273 (Allow `~const` bounds on non-const functions)
 - rust-lang#102286 (Recover some items that expect braces and don't take semicolons)

Failed merges:

 - rust-lang#102314 (Add a label to struct/enum/union ident name)

r? `@ghost`
`@rustbot` modify labels: rollup
notriddle added a commit to notriddle/rust that referenced this pull request Sep 26, 2022
…nion-ident, r=estebank

Add a label to struct/enum/union ident name

Based on rust-lang#94996 (comment)
cc: ``@estebank``
@bors
Copy link
Contributor

bors commented Sep 26, 2022

🔒 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 add-label-to-struct-enum-union-ident (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 add-label-to-struct-enum-union-ident --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
Auto-merging compiler/rustc_parse/src/parser/item.rs
CONFLICT (content): Merge conflict in compiler/rustc_parse/src/parser/item.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors 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 Sep 26, 2022
@bors
Copy link
Contributor

bors commented Sep 26, 2022

☔ The latest upstream changes (presumably #102324) made this pull request unmergeable. Please resolve the merge conflicts.

@TaKO8Ki TaKO8Ki force-pushed the add-label-to-struct-enum-union-ident branch from 9d49d64 to 5d05908 Compare September 27, 2022 01:32
@TaKO8Ki
Copy link
Member Author

TaKO8Ki commented Sep 27, 2022

@bors r=estebank

@bors
Copy link
Contributor

bors commented Sep 27, 2022

📌 Commit 5d05908 has been approved by estebank

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 27, 2022
@bors
Copy link
Contributor

bors commented Sep 27, 2022

⌛ Testing commit 5d05908 with merge d9297d2...

@bors
Copy link
Contributor

bors commented Sep 27, 2022

☀️ Test successful - checks-actions
Approved by: estebank
Pushing d9297d2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 27, 2022
@bors bors merged commit d9297d2 into rust-lang:master Sep 27, 2022
@rustbot rustbot added this to the 1.66.0 milestone Sep 27, 2022
@TaKO8Ki TaKO8Ki deleted the add-label-to-struct-enum-union-ident branch September 27, 2022 10:47
@rust-timer
Copy link
Collaborator

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

mean1 range count2
Regressions ❌
(primary)
0.7% [0.7%, 0.7%] 1
Regressions ❌
(secondary)
1.4% [1.2%, 1.6%] 6
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.7% [0.7%, 0.7%] 1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.4% [2.1%, 4.8%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.9% [-2.9%, -2.9%] 1
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean1 range count2
Regressions ❌
(primary)
3.7% [3.7%, 3.7%] 1
Regressions ❌
(secondary)
2.7% [2.0%, 3.3%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.6% [-4.7%, -2.5%] 2
All ❌✅ (primary) 3.7% [3.7%, 3.7%] 1

Footnotes

  1. the arithmetic mean of the percent change 2 3

  2. number of relevant changes 2 3

@rustbot rustbot added the perf-regression Performance regression. label Sep 27, 2022
@rylev
Copy link
Member

rylev commented Sep 27, 2022

keccak has been noisy recently, these regressions probably aren't real.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Sep 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants