Skip to content

replace GenericArg with Term where applicable #140320

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

Merged
merged 2 commits into from
Apr 26, 2025
Merged

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Apr 26, 2025

r? types

@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Apr 26, 2025
@rustbot
Copy link
Collaborator

rustbot commented Apr 26, 2025

changes to the core type system

cc @compiler-errors, @lcnr

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@@ -250,17 +250,17 @@ impl<'tcx> GenericArg<'tcx> {
}

#[inline]
pub fn as_type(self) -> Option<Ty<'tcx>> {
pub fn as_region(self) -> Option<ty::Region<'tcx>> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you flip these lol

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

region, type, const is the correct order :<

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

definitely do not agree. ty region const is the order in folders.

@compiler-errors
Copy link
Member

r=me after ci is green

@lcnr
Copy link
Contributor Author

lcnr commented Apr 26, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 26, 2025

📌 Commit 85fa395 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 Apr 26, 2025
@compiler-errors
Copy link
Member

@bors r+

approver is wrong

@bors
Copy link
Collaborator

bors commented Apr 26, 2025

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented Apr 26, 2025

📌 Commit 85fa395 has been approved by compiler-errors

It is now in the queue for this repository.

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2025
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#140215 (transmutability: Support char, NonZeroXxx)
 - rust-lang#140226 (Update wasm-component-ld to 0.5.13)
 - rust-lang#140317 (Remove redundant check)
 - rust-lang#140318 (Simply try to unpeel AsyncFnKindHelper goal in `emit_specialized_closure_kind_error`)
 - rust-lang#140320 (replace `GenericArg` with `Term` where applicable)
 - rust-lang#140325 (Grammar fixes for BufRead::has_data_left docs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3c322bc into rust-lang:master Apr 26, 2025
6 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 26, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2025
Rollup merge of rust-lang#140320 - lcnr:wf-use-term, r=compiler-errors

replace `GenericArg` with `Term` where applicable

r? types
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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants