DepKind cleanups - #160406
Merged
Merged
Conversation
This commit changes `DEP_KIND_NUM_VARIANTS` so it's an associated const (renamed as `DepKind::NUM_VARIANTS`) obtained via `std::mem::variant_count`, removing the paranoid consecutiveness check. The commit also replaces multiple `DepKind::MAX as usize + 1` occurrences with `DepKind::NUM_VARIANTS`.
It contains pre-stringified versions of all the `DepKind` variants. But
we can just stringify on demand using `format!("{:?}")`.
rustbot
added
S-waiting-on-review
Collaborator
|
|
cjgillot
reviewed
Aug 3, 2026
| /// pack information into the unused bits. u16 matches the `repr(u16)` on `DepKind`. | ||
| pub(crate) const MAX: u16 = { | ||
| let max = Self::NUM_VARIANTS - 1; | ||
| assert!(max < u16::MAX as usize); |
Contributor
There was a problem hiding this comment.
Why do we bother asserting? If the subtraction underflows, the constant won't compile, will it?
Contributor
Author
There was a problem hiding this comment.
NUM_VARIANTS is a usize. The intent here isn't to detect underflow, but to ensure there aren't more than 64K variants.
Member
There was a problem hiding this comment.
And while the variant count is presumably capped by #[repr(u16)] on the enum, this assertion has the benefit of making max as u16 obviously correct.
nnethercote
force-pushed
the
DepKind-cleanups
branch
from
August 3, 2026 02:34
1d9c8fd to
a707cbf
Compare
Member
|
Looks good, thanks. r=me when PR CI is green. |
Member
|
@bors r+ |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Aug 3, 2026
…lathar `DepKind` cleanups Details in individual commits. r? Zalathar
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Aug 3, 2026
…lathar `DepKind` cleanups Details in individual commits. r? Zalathar
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 3, 2026
…uwer Rollup of 6 pull requests Successful merges: - #159844 (Subtree cg_gcc sync (2026-07-24)) - #160406 (`DepKind` cleanups) - #159303 (Fix ICE for direct inline const generic defaults) - #160314 (fix borrowck ICE for consts with fn pointer type) - #160322 (ElaborateBoxDeref: remove unnecessary projection) - #160384 (Add PR body notes for Cargo lock file maintenance)
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Aug 3, 2026
…lathar `DepKind` cleanups Details in individual commits. r? Zalathar
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 3, 2026
…uwer Rollup of 21 pull requests Successful merges: - #159844 (Subtree cg_gcc sync (2026-07-24)) - #159326 (Deny multiple EII impls on a single item) - #159535 (Optimize slice::contains for bytewise types) - #159595 (Promote loongarch32-unknown-none* to Tier 2) - #160007 (allow `-Ldependency` search paths for panic runtimes) - #160320 (point at trait definition when it is used as a derive macro) - #160369 (When suggesting method names, prefer *exact* doc aliases over similar names) - #160406 (`DepKind` cleanups) - #160424 (Use `thread::available_parallelism` as the default limit for backend parallelism) - #159014 ([rustdoc] Do not take `doc(cfg())` into account when filtering doctests) - #159303 (Fix ICE for direct inline const generic defaults) - #159977 (Add regression test for bool indexing codegen) - #160165 (reject `...` without pattern post-expansion) - #160295 (Fix rustdoc ICE when checking if a generic arg can be elided) - #160305 (Linkify C-SKY targets in `platform-support.md`) - #160314 (fix borrowck ICE for consts with fn pointer type) - #160322 (ElaborateBoxDeref: remove unnecessary projection) - #160338 (Add regression test for supertrait associated type normalization through dyn) - #160340 (Add regression test for unused_parens on contract clauses) - #160371 (Add doc aliases for transpositions `read_exact_buf` and `read_exact_buf_at`) - #160384 (Add PR body notes for Cargo lock file maintenance)
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Aug 3, 2026
…lathar `DepKind` cleanups Details in individual commits. r? Zalathar
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 3, 2026
…uwer Rollup of 23 pull requests Successful merges: - #153749 (Account for ownership mismatch on argument that doesn't meet bound) - #159326 (Deny multiple EII impls on a single item) - #159535 (Optimize slice::contains for bytewise types) - #159595 (Promote loongarch32-unknown-none* to Tier 2) - #160007 (allow `-Ldependency` search paths for panic runtimes) - #160184 (Add -Zinstrument-mcount={fentry-nop-record,fentry-record}) - #160320 (point at trait definition when it is used as a derive macro) - #160369 (When suggesting method names, prefer *exact* doc aliases over similar names) - #160406 (`DepKind` cleanups) - #160424 (Use `thread::available_parallelism` as the default limit for backend parallelism) - #159303 (Fix ICE for direct inline const generic defaults) - #159977 (Add regression test for bool indexing codegen) - #160011 (remove InterpError::map_err_info) - #160165 (reject `...` without pattern post-expansion) - #160295 (Fix rustdoc ICE when checking if a generic arg can be elided) - #160305 (Linkify C-SKY targets in `platform-support.md`) - #160314 (fix borrowck ICE for consts with fn pointer type) - #160322 (ElaborateBoxDeref: remove unnecessary projection) - #160338 (Add regression test for supertrait associated type normalization through dyn) - #160340 (Add regression test for unused_parens on contract clauses) - #160371 (Add doc aliases for transpositions `read_exact_buf` and `read_exact_buf_at`) - #160384 (Add PR body notes for Cargo lock file maintenance) - #160435 (bump tracing-tree)
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Aug 3, 2026
…lathar `DepKind` cleanups Details in individual commits. r? Zalathar
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 4, 2026
…uwer Rollup of 26 pull requests Successful merges: - #153749 (Account for ownership mismatch on argument that doesn't meet bound) - #158727 (std: use `readdir` on nearly all UNIX platforms) - #159130 (a bit optimize four-digit chunks in integer formatting) - #159326 (Deny multiple EII impls on a single item) - #159535 (Optimize slice::contains for bytewise types) - #159595 (Promote loongarch32-unknown-none* to Tier 2) - #160184 (Add -Zinstrument-mcount={fentry-nop-record,fentry-record}) - #160320 (point at trait definition when it is used as a derive macro) - #160369 (When suggesting method names, prefer *exact* doc aliases over similar names) - #160406 (`DepKind` cleanups) - #160424 (Use `thread::available_parallelism` as the default limit for backend parallelism) - #159303 (Fix ICE for direct inline const generic defaults) - #159977 (Add regression test for bool indexing codegen) - #160011 (remove InterpError::map_err_info) - #160165 (reject `...` without pattern post-expansion) - #160295 (Fix rustdoc ICE when checking if a generic arg can be elided) - #160305 (Linkify C-SKY targets in `platform-support.md`) - #160314 (fix borrowck ICE for consts with fn pointer type) - #160322 (ElaborateBoxDeref: remove unnecessary projection) - #160338 (Add regression test for supertrait associated type normalization through dyn) - #160340 (Add regression test for unused_parens on contract clauses) - #160371 (Add doc aliases for transpositions `read_exact_buf` and `read_exact_buf_at`) - #160384 (Add PR body notes for Cargo lock file maintenance) - #160412 (Move duplicate-names check for #[rustc_must_implement_one_of] to attribute parser) - #160435 (bump tracing-tree) - #160449 (Fix lookup of object files)
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Aug 4, 2026
…lathar `DepKind` cleanups Details in individual commits. r? Zalathar
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Aug 4, 2026
…lathar `DepKind` cleanups Details in individual commits. r? Zalathar
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 4, 2026
Rollup of 28 pull requests Successful merges: - #153749 (Account for ownership mismatch on argument that doesn't meet bound) - #159130 (a bit optimize four-digit chunks in integer formatting) - #159326 (Deny multiple EII impls on a single item) - #159535 (Optimize slice::contains for bytewise types) - #159595 (Promote loongarch32-unknown-none* to Tier 2) - #160184 (Add -Zinstrument-mcount={fentry-nop-record,fentry-record}) - #160320 (point at trait definition when it is used as a derive macro) - #160369 (When suggesting method names, prefer *exact* doc aliases over similar names) - #160406 (`DepKind` cleanups) - #160424 (Use `thread::available_parallelism` as the default limit for backend parallelism) - #159303 (Fix ICE for direct inline const generic defaults) - #159977 (Add regression test for bool indexing codegen) - #160011 (remove InterpError::map_err_info) - #160165 (reject `...` without pattern post-expansion) - #160172 (tests: Enable `feature(stmt_expr_attributes)` in `2229_closure_analysis` tests) - #160295 (Fix rustdoc ICE when checking if a generic arg can be elided) - #160305 (Linkify C-SKY targets in `platform-support.md`) - #160314 (fix borrowck ICE for consts with fn pointer type) - #160322 (ElaborateBoxDeref: remove unnecessary projection) - #160338 (Add regression test for supertrait associated type normalization through dyn) - #160340 (Add regression test for unused_parens on contract clauses) - #160371 (Add doc aliases for transpositions `read_exact_buf` and `read_exact_buf_at`) - #160384 (Add PR body notes for Cargo lock file maintenance) - #160412 (Move duplicate-names check for #[rustc_must_implement_one_of] to attribute parser) - #160427 (Run try builds on EC2 by default) - #160435 (bump tracing-tree) - #160449 (Fix lookup of object files) - #160477 (Update the tracking issue for `borrowed_buf_init`)
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 4, 2026
Rollup of 28 pull requests Successful merges: - #153749 (Account for ownership mismatch on argument that doesn't meet bound) - #159130 (a bit optimize four-digit chunks in integer formatting) - #159326 (Deny multiple EII impls on a single item) - #159535 (Optimize slice::contains for bytewise types) - #159595 (Promote loongarch32-unknown-none* to Tier 2) - #160184 (Add -Zinstrument-mcount={fentry-nop-record,fentry-record}) - #160320 (point at trait definition when it is used as a derive macro) - #160369 (When suggesting method names, prefer *exact* doc aliases over similar names) - #160406 (`DepKind` cleanups) - #160424 (Use `thread::available_parallelism` as the default limit for backend parallelism) - #159303 (Fix ICE for direct inline const generic defaults) - #159977 (Add regression test for bool indexing codegen) - #160011 (remove InterpError::map_err_info) - #160165 (reject `...` without pattern post-expansion) - #160172 (tests: Enable `feature(stmt_expr_attributes)` in `2229_closure_analysis` tests) - #160295 (Fix rustdoc ICE when checking if a generic arg can be elided) - #160305 (Linkify C-SKY targets in `platform-support.md`) - #160314 (fix borrowck ICE for consts with fn pointer type) - #160322 (ElaborateBoxDeref: remove unnecessary projection) - #160338 (Add regression test for supertrait associated type normalization through dyn) - #160340 (Add regression test for unused_parens on contract clauses) - #160371 (Add doc aliases for transpositions `read_exact_buf` and `read_exact_buf_at`) - #160384 (Add PR body notes for Cargo lock file maintenance) - #160412 (Move duplicate-names check for #[rustc_must_implement_one_of] to attribute parser) - #160427 (Run try builds on EC2 by default) - #160435 (bump tracing-tree) - #160449 (Fix lookup of object files) - #160477 (Update the tracking issue for `borrowed_buf_init`)
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 4, 2026
Rollup of 28 pull requests Successful merges: - #153749 (Account for ownership mismatch on argument that doesn't meet bound) - #159130 (a bit optimize four-digit chunks in integer formatting) - #159326 (Deny multiple EII impls on a single item) - #159535 (Optimize slice::contains for bytewise types) - #159595 (Promote loongarch32-unknown-none* to Tier 2) - #160184 (Add -Zinstrument-mcount={fentry-nop-record,fentry-record}) - #160320 (point at trait definition when it is used as a derive macro) - #160369 (When suggesting method names, prefer *exact* doc aliases over similar names) - #160406 (`DepKind` cleanups) - #160424 (Use `thread::available_parallelism` as the default limit for backend parallelism) - #159303 (Fix ICE for direct inline const generic defaults) - #159977 (Add regression test for bool indexing codegen) - #160011 (remove InterpError::map_err_info) - #160165 (reject `...` without pattern post-expansion) - #160172 (tests: Enable `feature(stmt_expr_attributes)` in `2229_closure_analysis` tests) - #160295 (Fix rustdoc ICE when checking if a generic arg can be elided) - #160305 (Linkify C-SKY targets in `platform-support.md`) - #160314 (fix borrowck ICE for consts with fn pointer type) - #160322 (ElaborateBoxDeref: remove unnecessary projection) - #160338 (Add regression test for supertrait associated type normalization through dyn) - #160340 (Add regression test for unused_parens on contract clauses) - #160371 (Add doc aliases for transpositions `read_exact_buf` and `read_exact_buf_at`) - #160384 (Add PR body notes for Cargo lock file maintenance) - #160412 (Move duplicate-names check for #[rustc_must_implement_one_of] to attribute parser) - #160427 (Run try builds on EC2 by default) - #160435 (bump tracing-tree) - #160449 (Fix lookup of object files) - #160477 (Update the tracking issue for `borrowed_buf_init`)
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 4, 2026
Rollup of 29 pull requests Successful merges: - #153749 (Account for ownership mismatch on argument that doesn't meet bound) - #159130 (a bit optimize four-digit chunks in integer formatting) - #159326 (Deny multiple EII impls on a single item) - #159535 (Optimize slice::contains for bytewise types) - #159595 (Promote loongarch32-unknown-none* to Tier 2) - #160184 (Add -Zinstrument-mcount={fentry-nop-record,fentry-record}) - #160320 (point at trait definition when it is used as a derive macro) - #160369 (When suggesting method names, prefer *exact* doc aliases over similar names) - #160406 (`DepKind` cleanups) - #160424 (Use `thread::available_parallelism` as the default limit for backend parallelism) - #160434 (Avoid Docker push when the image did not change) - #159303 (Fix ICE for direct inline const generic defaults) - #159977 (Add regression test for bool indexing codegen) - #160011 (remove InterpError::map_err_info) - #160165 (reject `...` without pattern post-expansion) - #160172 (tests: Enable `feature(stmt_expr_attributes)` in `2229_closure_analysis` tests) - #160295 (Fix rustdoc ICE when checking if a generic arg can be elided) - #160305 (Linkify C-SKY targets in `platform-support.md`) - #160314 (fix borrowck ICE for consts with fn pointer type) - #160322 (ElaborateBoxDeref: remove unnecessary projection) - #160338 (Add regression test for supertrait associated type normalization through dyn) - #160340 (Add regression test for unused_parens on contract clauses) - #160371 (Add doc aliases for transpositions `read_exact_buf` and `read_exact_buf_at`) - #160384 (Add PR body notes for Cargo lock file maintenance) - #160412 (Move duplicate-names check for #[rustc_must_implement_one_of] to attribute parser) - #160427 (Run try builds on EC2 by default) - #160435 (bump tracing-tree) - #160449 (Fix lookup of object files) - #160477 (Update the tracking issue for `borrowed_buf_init`)
rust-timer
added a commit
that referenced
this pull request
Aug 4, 2026
Rollup merge of #160406 - nnethercote:DepKind-cleanups, r=Zalathar `DepKind` cleanups Details in individual commits. r? Zalathar
WhySoBad
pushed a commit
to WhySoBad/miri
that referenced
this pull request
Aug 5, 2026
Rollup of 29 pull requests Successful merges: - rust-lang/rust#153749 (Account for ownership mismatch on argument that doesn't meet bound) - rust-lang/rust#159130 (a bit optimize four-digit chunks in integer formatting) - rust-lang/rust#159326 (Deny multiple EII impls on a single item) - rust-lang/rust#159535 (Optimize slice::contains for bytewise types) - rust-lang/rust#159595 (Promote loongarch32-unknown-none* to Tier 2) - rust-lang/rust#160184 (Add -Zinstrument-mcount={fentry-nop-record,fentry-record}) - rust-lang/rust#160320 (point at trait definition when it is used as a derive macro) - rust-lang/rust#160369 (When suggesting method names, prefer *exact* doc aliases over similar names) - rust-lang/rust#160406 (`DepKind` cleanups) - rust-lang/rust#160424 (Use `thread::available_parallelism` as the default limit for backend parallelism) - rust-lang/rust#160434 (Avoid Docker push when the image did not change) - rust-lang/rust#159303 (Fix ICE for direct inline const generic defaults) - rust-lang/rust#159977 (Add regression test for bool indexing codegen) - rust-lang/rust#160011 (remove InterpError::map_err_info) - rust-lang/rust#160165 (reject `...` without pattern post-expansion) - rust-lang/rust#160172 (tests: Enable `feature(stmt_expr_attributes)` in `2229_closure_analysis` tests) - rust-lang/rust#160295 (Fix rustdoc ICE when checking if a generic arg can be elided) - rust-lang/rust#160305 (Linkify C-SKY targets in `platform-support.md`) - rust-lang/rust#160314 (fix borrowck ICE for consts with fn pointer type) - rust-lang/rust#160322 (ElaborateBoxDeref: remove unnecessary projection) - rust-lang/rust#160338 (Add regression test for supertrait associated type normalization through dyn) - rust-lang/rust#160340 (Add regression test for unused_parens on contract clauses) - rust-lang/rust#160371 (Add doc aliases for transpositions `read_exact_buf` and `read_exact_buf_at`) - rust-lang/rust#160384 (Add PR body notes for Cargo lock file maintenance) - rust-lang/rust#160412 (Move duplicate-names check for #[rustc_must_implement_one_of] to attribute parser) - rust-lang/rust#160427 (Run try builds on EC2 by default) - rust-lang/rust#160435 (bump tracing-tree) - rust-lang/rust#160449 (Fix lookup of object files) - rust-lang/rust#160477 (Update the tracking issue for `borrowed_buf_init`)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Details in individual commits.
r? Zalathar