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

Tweaks to adt_sized_constraint #114314

Merged
merged 3 commits into from
Aug 2, 2023
Merged

Conversation

compiler-errors
Copy link
Member

fixes a comment, but also some other nits.

r? 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Aug 1, 2023
@rustbot
Copy link
Collaborator

rustbot commented Aug 1, 2023

Some changes occurred to the core trait solver

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

Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

r=me after a small nit

/// the associated type is behind a pointer (e.g., issue #31299).
pub fn sized_constraint(self, tcx: TyCtxt<'tcx>) -> ty::EarlyBinder<&'tcx [Ty<'tcx>]> {
ty::EarlyBinder::bind(tcx.adt_sized_constraint(self.did()))
/// if that type is `Sized`, or `TyErr` if this type has a recursive
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/// if that type is `Sized`, or `TyErr` if this type has a recursive
/// if that type is `Sized`, or `ty::Error` if this type has a recursive

@lcnr lcnr 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 Aug 1, 2023
@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Aug 1, 2023

📌 Commit ac6f2f0 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 Aug 1, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 2, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#114178 (Account for macros when suggesting a new let binding)
 - rust-lang#114199 (Don't unsize coerce infer vars in select in new solver)
 - rust-lang#114301 (Don't check unnecessarily that impl trait is RPIT)
 - rust-lang#114314 (Tweaks to `adt_sized_constraint`)
 - rust-lang#114322 (Fix invalid slice coercion suggestion reported in turbofish)
 - rust-lang#114340 ([rustc_attr][nit] Replace `filter` + `is_some` with `map_or`.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3d29ce7 into rust-lang:master Aug 2, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 2, 2023
@compiler-errors compiler-errors deleted the sized-crit branch August 11, 2023 20:19
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.

4 participants