Skip to content

Rename probe_ty_var to try_resolve_ty_var#154578

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
jdonszelmann:rename-probe
Apr 2, 2026
Merged

Rename probe_ty_var to try_resolve_ty_var#154578
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
jdonszelmann:rename-probe

Conversation

@jdonszelmann
Copy link
Copy Markdown
Contributor

r? @lcnr

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 30, 2026

Some changes occurred in need_type_info.rs

cc @lcnr

changes to the core type system

cc @lcnr

@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 Mar 30, 2026
@lcnr
Copy link
Copy Markdown
Contributor

lcnr commented Mar 30, 2026

cc @BoxyUwU

@bors r+ rollup

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 30, 2026

📌 Commit 53ceea8 has been approved by lcnr

It is now in the queue for this repository.

@rust-bors rust-bors bot 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 Mar 30, 2026
@BoxyUwU
Copy link
Copy Markdown
Member

BoxyUwU commented Mar 30, 2026

@bors r-

why not also change the const equivalent?

@rust-bors rust-bors bot 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 Mar 30, 2026
@rustbot

This comment has been minimized.

@jdonszelmann
Copy link
Copy Markdown
Contributor Author

because I didn't realize there was one, makes sense though hehe

@jdonszelmann
Copy link
Copy Markdown
Contributor Author

@BoxyUwU pushed that

Copy link
Copy Markdown
Member

@BoxyUwU BoxyUwU left a comment

Choose a reason for hiding this comment

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

@BoxyUwU
Copy link
Copy Markdown
Member

BoxyUwU commented Mar 30, 2026

Actually lets wait for #154053 to land, it's already had to be rebased so many times and this will conflict 😅

@BoxyUwU
Copy link
Copy Markdown
Member

BoxyUwU commented Mar 31, 2026

#154053 has landed so this is good to go (maybe after a rebase, though it doesnt say anything about conflicts)

Co-authored-by: khyperia <953151+khyperia@users.noreply.github.com>
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 2, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@jdonszelmann
Copy link
Copy Markdown
Contributor Author

@bors r=lcnr,boxyuwu

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 2, 2026

📌 Commit 28b06a6 has been approved by lcnr,boxyuwu

It is now in the queue for this repository.

@rust-bors rust-bors bot 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 Apr 2, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Apr 2, 2026
…boxyuwu

Rename `probe_ty_var` to `try_resolve_ty_var`

r? @lcnr
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Apr 2, 2026
…boxyuwu

Rename `probe_ty_var` to `try_resolve_ty_var`

r? @lcnr
rust-bors bot pushed a commit that referenced this pull request Apr 2, 2026
…uwer

Rollup of 21 pull requests

Successful merges:

 - #153105 (Compute the result of a projection type with region errors)
 - #153286 (various fixes for scalable vectors)
 - #153532 (Attributes containing rustc)
 - #153960 (Make `layout_of` cycles fatal errors)
 - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization)
 - #154666 (Remove `StableHashContext` impls)
 - #154669 (Introduce #[diagnostic::on_move] on `Arc`)
 - #154710 (opaque_generic_const_args -> generic_const_args)
 - #154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph")
 - #154713 (Stop compiling when we get resolving crate failure)
 - #154213 (tidy-alphabetical: fix line number in error message)
 - #154425 (Migrate transmute tests)
 - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`)
 - #154469 (mGCA: Lower spans for literal const args)
 - #154578 (Rename `probe_ty_var` to `try_resolve_ty_var`)
 - #154615 (Moving issues)
 - #154644 (rustdoc: seperate methods and associated functions in sidebar)
 - #154660 (Avoid creating async return opaques for foreign async fns)
 - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args)
 - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)
 - #154709 (Revert `Ty` type alias in `rustc_type_ir`)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Apr 2, 2026
…boxyuwu

Rename `probe_ty_var` to `try_resolve_ty_var`

r? @lcnr
rust-bors bot pushed a commit that referenced this pull request Apr 2, 2026
…uwer

Rollup of 21 pull requests

Successful merges:

 - #153105 (Compute the result of a projection type with region errors)
 - #153286 (various fixes for scalable vectors)
 - #153532 (Attributes containing rustc)
 - #153960 (Make `layout_of` cycles fatal errors)
 - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization)
 - #154666 (Remove `StableHashContext` impls)
 - #154669 (Introduce #[diagnostic::on_move] on `Arc`)
 - #154710 (opaque_generic_const_args -> generic_const_args)
 - #154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph")
 - #153614 (`FindParamInClause` handle edge-cases)
 - #154213 (tidy-alphabetical: fix line number in error message)
 - #154425 (Migrate transmute tests)
 - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`)
 - #154469 (mGCA: Lower spans for literal const args)
 - #154578 (Rename `probe_ty_var` to `try_resolve_ty_var`)
 - #154615 (Moving issues)
 - #154644 (rustdoc: seperate methods and associated functions in sidebar)
 - #154660 (Avoid creating async return opaques for foreign async fns)
 - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args)
 - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)
 - #154709 (Revert `Ty` type alias in `rustc_type_ir`)
rust-bors bot pushed a commit that referenced this pull request Apr 2, 2026
…uwer

Rollup of 20 pull requests

Successful merges:

 - #153105 (Compute the result of a projection type with region errors)
 - #153532 (Attributes containing rustc)
 - #153960 (Make `layout_of` cycles fatal errors)
 - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization)
 - #154666 (Remove `StableHashContext` impls)
 - #154669 (Introduce #[diagnostic::on_move] on `Arc`)
 - #154710 (opaque_generic_const_args -> generic_const_args)
 - #154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph")
 - #153614 (`FindParamInClause` handle edge-cases)
 - #154213 (tidy-alphabetical: fix line number in error message)
 - #154425 (Migrate transmute tests)
 - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`)
 - #154469 (mGCA: Lower spans for literal const args)
 - #154578 (Rename `probe_ty_var` to `try_resolve_ty_var`)
 - #154615 (Moving issues)
 - #154644 (rustdoc: seperate methods and associated functions in sidebar)
 - #154660 (Avoid creating async return opaques for foreign async fns)
 - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args)
 - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)
 - #154709 (Revert `Ty` type alias in `rustc_type_ir`)
@rust-bors rust-bors bot merged commit 1c15595 into rust-lang:main Apr 2, 2026
11 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Apr 2, 2026
rust-timer added a commit that referenced this pull request Apr 2, 2026
Rollup merge of #154578 - jdonszelmann:rename-probe, r=lcnr,boxyuwu

Rename `probe_ty_var` to `try_resolve_ty_var`

r? @lcnr
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Apr 3, 2026
…uwer

Rollup of 20 pull requests

Successful merges:

 - rust-lang/rust#153105 (Compute the result of a projection type with region errors)
 - rust-lang/rust#153532 (Attributes containing rustc)
 - rust-lang/rust#153960 (Make `layout_of` cycles fatal errors)
 - rust-lang/rust#154527 (Emit pre-expansion feature gate warnings for negative impls and specialization)
 - rust-lang/rust#154666 (Remove `StableHashContext` impls)
 - rust-lang/rust#154669 (Introduce #[diagnostic::on_move] on `Arc`)
 - rust-lang/rust#154710 (opaque_generic_const_args -> generic_const_args)
 - rust-lang/rust#154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph")
 - rust-lang/rust#153614 (`FindParamInClause` handle edge-cases)
 - rust-lang/rust#154213 (tidy-alphabetical: fix line number in error message)
 - rust-lang/rust#154425 (Migrate transmute tests)
 - rust-lang/rust#154442 (Export `derive` at the crate root: `core::derive` and `std::derive`)
 - rust-lang/rust#154469 (mGCA: Lower spans for literal const args)
 - rust-lang/rust#154578 (Rename `probe_ty_var` to `try_resolve_ty_var`)
 - rust-lang/rust#154615 (Moving issues)
 - rust-lang/rust#154644 (rustdoc: seperate methods and associated functions in sidebar)
 - rust-lang/rust#154660 (Avoid creating async return opaques for foreign async fns)
 - rust-lang/rust#154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args)
 - rust-lang/rust#154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)
 - rust-lang/rust#154709 (Revert `Ty` type alias in `rustc_type_ir`)
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