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

Move supertrait_def_ids into the elaborate module like all other fns #135706

Merged
merged 1 commit into from
Jan 22, 2025

Conversation

compiler-errors
Copy link
Member

It's strange that this is the only elaborate-like fn on tcx.

r? lcnr

@bors
Copy link
Contributor

bors commented Jan 21, 2025

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

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 21, 2025
@compiler-errors
Copy link
Member Author

r? lcnr

weird that rustbot never assigned this one lol

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 21, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 21, 2025

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@lcnr
Copy link
Contributor

lcnr commented Jan 21, 2025

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 21, 2025

📌 Commit 45929a8 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 Jan 21, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 22, 2025
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#132232 (CI: build FreeBSD artifacts on FreeBSD 13.4)
 - rust-lang#135706 (Move `supertrait_def_ids` into the elaborate module like all other fns)
 - rust-lang#135750 (Add an example of using `carrying_mul_add` to write wider multiplication)
 - rust-lang#135793 (Ignore `mermaid.min.js`)
 - rust-lang#135810 (Add Kobzol on vacation)
 - rust-lang#135821 (fix OsString::from_encoded_bytes_unchecked description)
 - rust-lang#135824 (tests: delete `cat-and-grep-sanity-check`)
 - rust-lang#135833 (Add fixme and test for issue rust-lang#135289)

Failed merges:

 - rust-lang#135816 (Use `structurally_normalize` instead of manual `normalizes-to` goals in alias relate errors)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4af3ff8 into rust-lang:master Jan 22, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 22, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 22, 2025
Rollup merge of rust-lang#135706 - compiler-errors:elaborate, r=lcnr

Move `supertrait_def_ids` into the elaborate module like all other fns

It's strange that this is the only elaborate-like fn on tcx.

r? lcnr
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.

4 participants