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.

Sign up for GitHub

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

Jump to bottom

Align Term methods with GenericArg methods, add Term::expect_* #125750

Merged
merged 1 commit into from
Jun 4, 2024
Merged

Align Term methods with GenericArg methods, add Term::expect_* #125750

merged 1 commit into from
Jun 4, 2024

Conversation

compiler-errors
Copy link
Member

  • Term::ty -> Term::as_type.
  • Term::ct -> Term::as_const.
  • Adds Term::expect_type and Term::expect_const, and uses them in favor of .ty().unwrap(), etc.

I could also shorten these to as_ty and then do GenericArg::as_ty as well, but I do think the as_ is important to signal that this is a conversion method, and not a getter, like Const::ty is.

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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels May 30, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 30, 2024

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

Some changes occurred to the core trait solver

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

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

changes to the core type system

cc @compiler-errors, @lcnr

@compiler-errors
Copy link
Member Author

compiler-errors commented May 30, 2024 •
edited
Loading

Sorry rust-analyzer people, global replacement got a bit aggressive

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lcnr
Copy link
Contributor

lcnr commented May 30, 2024

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 30, 2024

📌 Commit 5006fc8 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 30, 2024
fmease added a commit to fmease/rust that referenced this pull request May 30, 2024
@fmease
Rollup merge of rust-lang#125750 - compiler-errors:expect, r=lcnr
e29bac1 
Align `Term` methods with `GenericArg` methods, add `Term::expect_*`

* `Term::ty` -> `Term::as_type`.
* `Term::ct` -> `Term::as_const`.
* Adds `Term::expect_type` and `Term::expect_const`, and uses them in favor of `.ty().unwrap()`, etc.

I could also shorten these to `as_ty` and then do `GenericArg::as_ty` as well, but I do think the `as_` is important to signal that this is a conversion method, and not a getter, like `Const::ty` is.

r? types
@fmease fmease mentioned this pull request May 30, 2024
Closed
@bors
Copy link
Contributor

bors commented May 31, 2024

⌛ Testing commit 5006fc8 with merge 889a8f7...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 31, 2024
@bors
Auto merge of rust-lang#125750 - compiler-errors:expect, r=lcnr
889a8f7 
Align `Term` methods with `GenericArg` methods, add `Term::expect_*`

* `Term::ty` -> `Term::as_type`.
* `Term::ct` -> `Term::as_const`.
* Adds `Term::expect_type` and `Term::expect_const`, and uses them in favor of `.ty().unwrap()`, etc.

I could also shorten these to `as_ty` and then do `GenericArg::as_ty` as well, but I do think the `as_` is important to signal that this is a conversion method, and not a getter, like `Const::ty` is.

r? types
@bors
Copy link
Contributor

bors commented May 31, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 31, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@BoxyUwU BoxyUwU assigned lcnr and unassigned BoxyUwU May 31, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Jun 3, 2024

@bors r- (bors funny business)

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 3, 2024
@compiler-errors
Copy link
Member Author

Rebased and fixed clippy

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Jun 4, 2024

📌 Commit 273b990 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 Jun 4, 2024
Noratrieb added a commit to Noratrieb/rust that referenced this pull request Jun 4, 2024
@Noratrieb
Rollup merge of rust-lang#125750 - compiler-errors:expect, r=lcnr
5b9bf8d 
Align `Term` methods with `GenericArg` methods, add `Term::expect_*`

* `Term::ty` -> `Term::as_type`.
* `Term::ct` -> `Term::as_const`.
* Adds `Term::expect_type` and `Term::expect_const`, and uses them in favor of `.ty().unwrap()`, etc.

I could also shorten these to `as_ty` and then do `GenericArg::as_ty` as well, but I do think the `as_` is important to signal that this is a conversion method, and not a getter, like `Const::ty` is.

r? types
@Noratrieb Noratrieb mentioned this pull request Jun 4, 2024
Closed
Noratrieb added a commit to Noratrieb/rust that referenced this pull request Jun 4, 2024
@Noratrieb
Rollup merge of rust-lang#125750 - compiler-errors:expect, r=lcnr
3c658d2 
Align `Term` methods with `GenericArg` methods, add `Term::expect_*`

* `Term::ty` -> `Term::as_type`.
* `Term::ct` -> `Term::as_const`.
* Adds `Term::expect_type` and `Term::expect_const`, and uses them in favor of `.ty().unwrap()`, etc.

I could also shorten these to `as_ty` and then do `GenericArg::as_ty` as well, but I do think the `as_` is important to signal that this is a conversion method, and not a getter, like `Const::ty` is.

r? types
@Noratrieb Noratrieb mentioned this pull request Jun 4, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 4, 2024
@bors
Auto merge of rust-lang#125956 - Nilstrieb:rollup-rzr7co8, r=Nilstrieb
e3602a5 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#122804 (Item bounds can reference self projections and still be object safe)
 - rust-lang#124486 (Add tracking issue and unstable book page for `"vectorcall"` ABI)
 - rust-lang#125504 (Change pedantically incorrect OnceCell/OnceLock wording)
 - rust-lang#125608 (Avoid follow-up errors if the number of generic parameters already doesn't match)
 - rust-lang#125690 (ARM Target Docs Update)
 - rust-lang#125750 (Align `Term` methods with `GenericArg` methods, add `Term::expect_*`)
 - rust-lang#125818 (Handle no values cfgs with `--print=check-cfg`)
 - rust-lang#125909 (rustdoc: add a regression test for a former blanket impl synthesis ICE)
 - rust-lang#125919 (Remove stray "this")

r? `@ghost`
`@rustbot` modify labels: rollup
@jieyouxu jieyouxu mentioned this pull request Jun 4, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 4, 2024
@bors
Auto merge of rust-lang#125960 - jieyouxu:rollup-1s7f6lr, r=jieyouxu
85f90a4 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#124486 (Add tracking issue and unstable book page for `"vectorcall"` ABI)
 - rust-lang#125504 (Change pedantically incorrect OnceCell/OnceLock wording)
 - rust-lang#125608 (Avoid follow-up errors if the number of generic parameters already doesn't match)
 - rust-lang#125690 (ARM Target Docs Update)
 - rust-lang#125750 (Align `Term` methods with `GenericArg` methods, add `Term::expect_*`)
 - rust-lang#125818 (Handle no values cfgs with `--print=check-cfg`)
 - rust-lang#125909 (rustdoc: add a regression test for a former blanket impl synthesis ICE)
 - rust-lang#125919 (Remove stray "this")

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b477f89 into rust-lang:master Jun 4, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Jun 4, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 4, 2024
@rust-timer
Unrolled build for rust-lang#125750
c090fe6 
Rollup merge of rust-lang#125750 - compiler-errors:expect, r=lcnr

Align `Term` methods with `GenericArg` methods, add `Term::expect_*`

* `Term::ty` -> `Term::as_type`.
* `Term::ct` -> `Term::as_const`.
* Adds `Term::expect_type` and `Term::expect_const`, and uses them in favor of `.ty().unwrap()`, etc.

I could also shorten these to `as_ty` and then do `GenericArg::as_ty` as well, but I do think the `as_` is important to signal that this is a conversion method, and not a getter, like `Const::ty` is.

r? types
@compiler-errors compiler-errors deleted the expect branch June 4, 2024 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lcnr lcnr

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. T-rustdoc Relevant to the rustdoc 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
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.
7 participants
@compiler-errors @rustbot @rust-log-analyzer @lcnr @bors @jieyouxu @BoxyUwU