Skip to content

Conversation

WaffleLapkin
Copy link
Member

This PR

  • Removes use RibKind::*
  • Renames RibKind::{SomethingRibKind => Something}

It seems unnecessary to have "RibKind" in the end of all variants, if we can just use it as a normal enum. Additionally previously it was weird that MacroDefinition is the only unsuffixed variant.

@rustbot
Copy link
Collaborator

rustbot commented May 1, 2023

r? @lcnr

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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 1, 2023
@lcnr
Copy link
Contributor

lcnr commented May 2, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 2, 2023

📌 Commit 0fa5920 has been approved by lcnr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 2, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 3, 2023
Don't suffix `RibKind` variants

This PR
- Removes `use RibKind::*`
- Renames `RibKind::{SomethingRibKind => Something}`

It seems unnecessary to have "RibKind" in the end of all variants, if we can just use it as a normal enum. Additionally previously it was weird that `MacroDefinition` is the only unsuffixed variant.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 3, 2023
Don't suffix `RibKind` variants

This PR
- Removes `use RibKind::*`
- Renames `RibKind::{SomethingRibKind => Something}`

It seems unnecessary to have "RibKind" in the end of all variants, if we can just use it as a normal enum. Additionally previously it was weird that `MacroDefinition` is the only unsuffixed variant.
@Dylan-DPC
Copy link
Member

@bors r-

failed in rollup

@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 May 3, 2023
@WaffleLapkin
Copy link
Member Author

@Dylan-DPC why do you think this PR is the cause? The failure is with uploading artifacts to S3:

Run src/ci/scripts/upload-artifacts.sh
cp: cannot stat 'build/metrics.json': No such file or directory
Error: Process completed with exit code 1.

This pr did not touch build/metrics.json and I don't see how it can cause anything like that...

@Dylan-DPC
Copy link
Member

I think something is wrong with the log viewer, but if you check the raw log it shows you the entire error. But i don't see the option to view raw logs any more so i guess we'll just retry it and see what happens

@Dylan-DPC
Copy link
Member

@bors r=lcnr

@bors
Copy link
Collaborator

bors commented May 3, 2023

📌 Commit 0fa5920 has been approved by lcnr

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 May 3, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#110859 (Explicitly reject negative and reservation drop impls)
 - rust-lang#111020 (Validate resolution for SelfCtor too.)
 - rust-lang#111024 (Use the full Fingerprint when stringifying Svh)
 - rust-lang#111027 (Remove `allow(rustc::potential_query_instability)` for `builtin_macros`)
 - rust-lang#111039 (Encode def span for foreign return-position `impl Trait` in trait)
 - rust-lang#111070 (Don't suffix `RibKind` variants)
 - rust-lang#111094 (Add needs-unwind annotations to tests that need stack unwinding)
 - rust-lang#111103 (correctly recurse when expanding anon consts)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5075457 into rust-lang:master May 4, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 4, 2023
@WaffleLapkin WaffleLapkin deleted the break_ribs branch June 1, 2025 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants