Skip to content

Cast cleanups - #163520

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
nnethercote:cast-cleanups
Oct 1, 2026
Merged

Cast cleanups#163520
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
nnethercote:cast-cleanups

Conversation

@nnethercote

@nnethercote nnethercote commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

At one point I was looking at merging ast::IntTy and ast::UintTy into a single type. In the end I decided against that, but I did find some related code, mostly involving casts, that deserved some cleanups. Details in individual commits.

r? @oli-obk

@nnethercote
Use {IntTy,UintTy}::name in Ty::primitive_symbol
d10b01c
@nnethercote
Remove unused rustc_middle::ty::cast::IntTy::is_signed
7af2cce
@nnethercote
Remove rustc_middle::ty::cast::IntTy
a5e0df2 
Currently it covers "int-like" types: integers, integer inference
variables, bools, chars, and C-like enums. It's a bit weird, especially
the asymmetry between the fielded `U` and fieldless `I` variants.

This commit merges it into `CastTy`, and adds an `is_int_like` method.
Some of the checking is now more strict, accepting only ints where
before it accepted int-likes (e.g. casting a bool to a ptr) in
`TypeChecker::visit_rvalue` and `mir_cast_kind`. `CastCheck::do_check`
already rejects these int-like cases, which means they can't occur in
MIR built from THIR. The only way to hit the stricter checking is in
custom MIR.

The commit also removes some unused derives from `CastKind` and fixes a
couple of stale comments.
@nnethercote
Move rustc_middle::ty::cast::CastKind
9bdf58f 
It's not used in `rustc_middle`, it's only used in `rustc_hir_typeck`
and clippy. (It's always good to remove things from `rustc_middle`.)
@rustbot

rustbot commented Sep 30, 2026

Copy link
Copy Markdown
Collaborator

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

cc @rust-lang/clippy

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 30, 2026
oli-obk
oli-obk approved these changes Sep 30, 2026
View reviewed changes

@oli-obk oli-obk left a comment •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@bors r+ rollup

View changes since this review

@rust-bors

rust-bors Bot commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 9bdf58f has been approved by oli-obk

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 Sep 30, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Sep 30, 2026
@JonathanBrouwer
Rollup merge of rust-lang#163520 - nnethercote:cast-cleanups, r=oli-obk
1c672e1 
Cast cleanups

At one point I was looking at merging `ast::IntTy` and `ast::UintTy` into a single type. In the end I decided against that, but I did find some related code, mostly involving casts, that deserved some cleanups. Details in individual commits.

r? @oli-obk
@JonathanBrouwer JonathanBrouwer mentioned this pull request Sep 30, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Sep 30, 2026
@JonathanBrouwer
Rollup merge of rust-lang#163520 - nnethercote:cast-cleanups, r=oli-obk
363caa3 
Cast cleanups

At one point I was looking at merging `ast::IntTy` and `ast::UintTy` into a single type. In the end I decided against that, but I did find some related code, mostly involving casts, that deserved some cleanups. Details in individual commits.

r? @oli-obk
@JonathanBrouwer JonathanBrouwer mentioned this pull request Sep 30, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Sep 30, 2026
@JonathanBrouwer
Rollup merge of rust-lang#163520 - nnethercote:cast-cleanups, r=oli-obk
40d3496 
Cast cleanups

At one point I was looking at merging `ast::IntTy` and `ast::UintTy` into a single type. In the end I decided against that, but I did find some related code, mostly involving casts, that deserved some cleanups. Details in individual commits.

r? @oli-obk
@JonathanBrouwer JonathanBrouwer mentioned this pull request Sep 30, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Sep 30, 2026
@bors
Auto merge of #163560 - JonathanBrouwer:rollup-i6jC441, r=JonathanBro…
12127cc 
…uwer

Rollup of 18 pull requests

Successful merges:

 - #163532 (rustc_codegen_cranelift subtree update)
 - #163534 (miri subtree update)
 - #163279 (const and NonZero impl for clamp_magnitude())
 - #162900 (Some refactorings around metadata encoding)
 - #163455 (Don't use the metadata based crate_hash for rustdoc runs)
 - #163483 (Bump bootstrap compiler to 1.100.0 beta)
 - #159798 (Attribute documentation for cfg_attr)
 - #163368 (Don't build format string suggestions from `concat!` offsets)
 - #163375 (Update expect messages in library/std/src/os/unix/net/ following Rust's `expect` guidance)
 - #163405 (Remove some #[linkage] options)
 - #163470 (Miscellaneous attr error stuff)
 - #163489 (expose Rc::is_unique)
 - #163492 (x86 and x86_64: cleanup some callconv code)
 - #163496 (cycle handling: mirror old solver)
 - #163509 (Use more default field values in `Resolver`)
 - #163519 (Forbid  `Reborrow` impls for types with destructors)
 - #163520 (Cast cleanups)
 - #163524 (Document `Result` case for the `arena_cache` query modifier)

Failed merges:

 - #163547 ([beta] rustfmt backport)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Sep 30, 2026
@JonathanBrouwer
Rollup merge of rust-lang#163520 - nnethercote:cast-cleanups, r=oli-obk
40a139e 
Cast cleanups

At one point I was looking at merging `ast::IntTy` and `ast::UintTy` into a single type. In the end I decided against that, but I did find some related code, mostly involving casts, that deserved some cleanups. Details in individual commits.

r? @oli-obk
@JonathanBrouwer JonathanBrouwer mentioned this pull request Sep 30, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Sep 30, 2026
@bors
Auto merge of #163566 - JonathanBrouwer:rollup-UyBYK1C, r=JonathanBro…
a2c44a3 
…uwer

Rollup of 18 pull requests

Successful merges:

 - #163532 (rustc_codegen_cranelift subtree update)
 - #163534 (miri subtree update)
 - #163279 (const and NonZero impl for clamp_magnitude())
 - #162900 (Some refactorings around metadata encoding)
 - #163455 (Don't use the metadata based crate_hash for rustdoc runs)
 - #159798 (Attribute documentation for cfg_attr)
 - #162921 (make mips64 `Complex` GCC-compatible)
 - #163368 (Don't build format string suggestions from `concat!` offsets)
 - #163375 (Update expect messages in library/std/src/os/unix/net/ following Rust's `expect` guidance)
 - #163405 (Remove some #[linkage] options)
 - #163470 (Miscellaneous attr error stuff)
 - #163489 (expose Rc::is_unique)
 - #163492 (x86 and x86_64: cleanup some callconv code)
 - #163496 (cycle handling: mirror old solver)
 - #163509 (Use more default field values in `Resolver`)
 - #163519 (Forbid  `Reborrow` impls for types with destructors)
 - #163520 (Cast cleanups)
 - #163524 (Document `Result` case for the `arena_cache` query modifier)
rust-bors Bot pushed a commit that referenced this pull request Sep 30, 2026
@bors
Auto merge of #163566 - JonathanBrouwer:rollup-UyBYK1C, r=JonathanBro…
103837a 
…uwer

Rollup of 18 pull requests

Successful merges:

 - #163532 (rustc_codegen_cranelift subtree update)
 - #163534 (miri subtree update)
 - #163279 (const and NonZero impl for clamp_magnitude())
 - #162900 (Some refactorings around metadata encoding)
 - #163455 (Don't use the metadata based crate_hash for rustdoc runs)
 - #159798 (Attribute documentation for cfg_attr)
 - #162921 (make mips64 `Complex` GCC-compatible)
 - #163368 (Don't build format string suggestions from `concat!` offsets)
 - #163375 (Update expect messages in library/std/src/os/unix/net/ following Rust's `expect` guidance)
 - #163405 (Remove some #[linkage] options)
 - #163470 (Miscellaneous attr error stuff)
 - #163489 (expose Rc::is_unique)
 - #163492 (x86 and x86_64: cleanup some callconv code)
 - #163496 (cycle handling: mirror old solver)
 - #163509 (Use more default field values in `Resolver`)
 - #163519 (Forbid  `Reborrow` impls for types with destructors)
 - #163520 (Cast cleanups)
 - #163524 (Document `Result` case for the `arena_cache` query modifier)
@jhpratt jhpratt mentioned this pull request Oct 1, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Oct 1, 2026
@bors
Auto merge of #163583 - jhpratt:rollup-KbTrszs, r=jhpratt
837b18a 
Rollup of 20 pull requests

Successful merges:

 - #163279 (const and NonZero impl for clamp_magnitude())
 - #163081 (Provide more context on "not general enough" error)
 - #163455 (Don't use the metadata based crate_hash for rustdoc runs)
 - #159798 (Attribute documentation for cfg_attr)
 - #162921 (make mips64 `Complex` GCC-compatible)
 - #163368 (Don't build format string suggestions from `concat!` offsets)
 - #163375 (Update expect messages in library/std/src/os/unix/net/ following Rust's `expect` guidance)
 - #163470 (Miscellaneous attr error stuff)
 - #163489 (expose Rc::is_unique)
 - #163492 (x86 and x86_64: cleanup some callconv code)
 - #163496 (cycle handling: mirror old solver)
 - #163509 (Use more default field values in `Resolver`)
 - #163519 (Forbid  `Reborrow` impls for types with destructors)
 - #163520 (Cast cleanups)
 - #163524 (Document `Result` case for the `arena_cache` query modifier)
 - #163546 (PassWrapper: adapt for new PassPlugin load method)
 - #163551 (Add libs-nominated triagebot config)
 - #163559 (Suggest `#[unsafe(no_mangle)]` for entry points in `no_std` binaries)
 - #163564 (rustc-dev-guide subtree update)
 - #163568 (remove dead cfg_select! arm)
@rust-bors
rust-bors Bot merged commit 1bea8be into rust-lang:main Oct 1, 2026
13 checks passed
@rustbot rustbot added this to the 1.101.0 milestone Oct 1, 2026
rust-bors Bot pushed a commit that referenced this pull request Oct 1, 2026
@bors
Unrolled build for #163520 in rollup 163583
2ec9db8 
Rollup merge of #163520 - nnethercote:cast-cleanups, r=oli-obk

Cast cleanups

At one point I was looking at merging `ast::IntTy` and `ast::UintTy` into a single type. In the end I decided against that, but I did find some related code, mostly involving casts, that deserved some cleanups. Details in individual commits.

r? @oli-obk
@nnethercote
nnethercote deleted the cast-cleanups branch October 1, 2026 09:59
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Oct 1, 2026
@bors
Auto merge of #163583 - jhpratt:rollup-KbTrszs, r=jhpratt
7edc483 
Rollup of 20 pull requests

Successful merges:

 - rust-lang/rust#163279 (const and NonZero impl for clamp_magnitude())
 - rust-lang/rust#163081 (Provide more context on "not general enough" error)
 - rust-lang/rust#163455 (Don't use the metadata based crate_hash for rustdoc runs)
 - rust-lang/rust#159798 (Attribute documentation for cfg_attr)
 - rust-lang/rust#162921 (make mips64 `Complex` GCC-compatible)
 - rust-lang/rust#163368 (Don't build format string suggestions from `concat!` offsets)
 - rust-lang/rust#163375 (Update expect messages in library/std/src/os/unix/net/ following Rust's `expect` guidance)
 - rust-lang/rust#163470 (Miscellaneous attr error stuff)
 - rust-lang/rust#163489 (expose Rc::is_unique)
 - rust-lang/rust#163492 (x86 and x86_64: cleanup some callconv code)
 - rust-lang/rust#163496 (cycle handling: mirror old solver)
 - rust-lang/rust#163509 (Use more default field values in `Resolver`)
 - rust-lang/rust#163519 (Forbid  `Reborrow` impls for types with destructors)
 - rust-lang/rust#163520 (Cast cleanups)
 - rust-lang/rust#163524 (Document `Result` case for the `arena_cache` query modifier)
 - rust-lang/rust#163546 (PassWrapper: adapt for new PassPlugin load method)
 - rust-lang/rust#163551 (Add libs-nominated triagebot config)
 - rust-lang/rust#163559 (Suggest `#[unsafe(no_mangle)]` for entry points in `no_std` binaries)
 - rust-lang/rust#163564 (rustc-dev-guide subtree update)
 - rust-lang/rust#163568 (remove dead cfg_select! arm)
@github-actions github-actions Bot mentioned this pull request Oct 3, 2026
Draft
github-actions Bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Oct 5, 2026
@bors
Auto merge of #163583 - jhpratt:rollup-KbTrszs, r=jhpratt
25525fb 
Rollup of 20 pull requests

Successful merges:

 - rust-lang/rust#163279 (const and NonZero impl for clamp_magnitude())
 - rust-lang/rust#163081 (Provide more context on "not general enough" error)
 - rust-lang/rust#163455 (Don't use the metadata based crate_hash for rustdoc runs)
 - rust-lang/rust#159798 (Attribute documentation for cfg_attr)
 - rust-lang/rust#162921 (make mips64 `Complex` GCC-compatible)
 - rust-lang/rust#163368 (Don't build format string suggestions from `concat!` offsets)
 - rust-lang/rust#163375 (Update expect messages in library/std/src/os/unix/net/ following Rust's `expect` guidance)
 - rust-lang/rust#163470 (Miscellaneous attr error stuff)
 - rust-lang/rust#163489 (expose Rc::is_unique)
 - rust-lang/rust#163492 (x86 and x86_64: cleanup some callconv code)
 - rust-lang/rust#163496 (cycle handling: mirror old solver)
 - rust-lang/rust#163509 (Use more default field values in `Resolver`)
 - rust-lang/rust#163519 (Forbid  `Reborrow` impls for types with destructors)
 - rust-lang/rust#163520 (Cast cleanups)
 - rust-lang/rust#163524 (Document `Result` case for the `arena_cache` query modifier)
 - rust-lang/rust#163546 (PassWrapper: adapt for new PassPlugin load method)
 - rust-lang/rust#163551 (Add libs-nominated triagebot config)
 - rust-lang/rust#163559 (Suggest `#[unsafe(no_mangle)]` for entry points in `no_std` binaries)
 - rust-lang/rust#163564 (rustc-dev-guide subtree update)
 - rust-lang/rust#163568 (remove dead cfg_select! arm)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk oli-obk approved these changes

Assignees

@oli-obk oli-obk

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.101.0

Development

Successfully merging this pull request may close these issues.

3 participants

@nnethercote @rustbot @oli-obk