Skip to content

Deduplicate IntTy/UintTy/FloatTy.#144712

Merged
bors merged 2 commits intorust-lang:masterfrom
nnethercote:dedup-num-types
Jul 31, 2025
Merged

Deduplicate IntTy/UintTy/FloatTy.#144712
bors merged 2 commits intorust-lang:masterfrom
nnethercote:dedup-num-types

Conversation

@nnethercote
Copy link
Contributor

@nnethercote nnethercote commented Jul 31, 2025

There are identical definitions in rustc_type_ir and rustc_ast. This commit removes them and places a single definition in rustc_ast_ir. This requires adding rust_span as a dependency of rustc_ast_ir, but means a bunch of silly conversion functions can be removed.

r? @fmease

@rustbot
Copy link
Collaborator

rustbot commented Jul 31, 2025

fmease is currently at their maximum review capacity.
They may take a while to respond.

@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. PG-exploit-mitigations Project group: Exploit mitigations 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. 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 Jul 31, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jul 31, 2025

HIR ty lowering was modified

cc @fmease

This PR changes rustc_public

cc @oli-obk, @celinval, @ouz-a

Some changes occurred in compiler/rustc_sanitizers

cc @rcvalle

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in exhaustiveness checking

cc @Nadrieril

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@nnethercote
Deduplicate IntTy/UintTy/FloatTy.
1901dde 
There are identical definitions in `rustc_type_ir` and `rustc_ast`. This
commit removes them and places a single definition in `rustc_ast_ir`.
This requires adding `rust_span` as a dependency of `rustc_ast_ir`, but
means a bunch of silly conversion functions can be removed.

The one annoying wrinkle is that the old version had differences in
their `Debug` impls, e.g. one printed `u32` while the other printed
`U32`. Some compiler error messages rely on the former (yuk), and some
clippy output depends on the latter. So the commit also changes clippy
to not rely on `Debug` and just implement what it needs itself.
@nnethercote
Tidy up Cargo.toml files.
704f2ca 
- Add some missing `tidy-alphabetical-*` markers.
- Remove some unnecessary blank lines.
fmease
fmease approved these changes Jul 31, 2025
View reviewed changes
compiler/rustc_ast_ir/src/lib.rs

impl fmt::Debug for IntTy {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", self.name_str())
Copy link
Member

@fmease fmease Jul 31, 2025

Choose a reason for hiding this comment

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

You could do (here and in the other places)

Suggested change
write!(f, "{}", self.name_str())
f.write_str(self.name_str())

but it doesn't really matter.

Edit: Ah, it's pre-existing.

@fmease
Copy link
Member

fmease commented Jul 31, 2025

Thanks, very nice! @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 31, 2025

📌 Commit 704f2ca has been approved by fmease

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 Jul 31, 2025
@jdonszelmann jdonszelmann mentioned this pull request Jul 31, 2025
Merged
bors added a commit that referenced this pull request Jul 31, 2025
@bors
Auto merge of #144740 - jdonszelmann:rollup-nprgqnm, r=jdonszelmann
adcb3d3 
Rollup of 6 pull requests

Successful merges:

 - #144688 (Uniform `enter_trace_span!` and add documentation)
 - #144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
 - #144711 (Consider operator's span when computing binop expr span)
 - #144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
 - #144726 (merge rustc_attr_data_structures into rustc_hir)
 - #144733 (fix: Match width of ascii and unicode secondary file start)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5712d50 into rust-lang:master Jul 31, 2025
10 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 31, 2025
rust-timer added a commit that referenced this pull request Jul 31, 2025
@rust-timer
Unrolled build for #144712
f05d87e 
Rollup merge of #144712 - nnethercote:dedup-num-types, r=fmease

Deduplicate `IntTy`/`UintTy`/`FloatTy`.

There are identical definitions in `rustc_type_ir` and `rustc_ast`. This commit removes them and places a single definition in `rustc_ast_ir`. This requires adding `rust_span` as a dependency of `rustc_ast_ir`, but means a bunch of silly conversion functions can be removed.

r? `@fmease`
@nnethercote nnethercote deleted the dedup-num-types branch July 31, 2025 21:26
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Aug 1, 2025
@bors
Auto merge of #144740 - jdonszelmann:rollup-nprgqnm, r=jdonszelmann
5825740 
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#144688 (Uniform `enter_trace_span!` and add documentation)
 - rust-lang/rust#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
 - rust-lang/rust#144711 (Consider operator's span when computing binop expr span)
 - rust-lang/rust#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
 - rust-lang/rust#144726 (merge rustc_attr_data_structures into rustc_hir)
 - rust-lang/rust#144733 (fix: Match width of ascii and unicode secondary file start)

r? `@ghost`
`@rustbot` modify labels: rollup
flip1995 pushed a commit to flip1995/rust that referenced this pull request Aug 7, 2025
@jdonszelmann
Rollup merge of rust-lang#144712 - nnethercote:dedup-num-types, r=fmease
d6a9497 
Deduplicate `IntTy`/`UintTy`/`FloatTy`.

There are identical definitions in `rustc_type_ir` and `rustc_ast`. This commit removes them and places a single definition in `rustc_ast_ir`. This requires adding `rust_span` as a dependency of `rustc_ast_ir`, but means a bunch of silly conversion functions can be removed.

r? `@fmease`
rust-cloud-vms bot pushed a commit to makai410/rustc_public that referenced this pull request Aug 16, 2025
@bors
Auto merge of #144740 - jdonszelmann:rollup-nprgqnm, r=jdonszelmann
28a13c5 
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#144688 (Uniform `enter_trace_span!` and add documentation)
 - rust-lang/rust#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
 - rust-lang/rust#144711 (Consider operator's span when computing binop expr span)
 - rust-lang/rust#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
 - rust-lang/rust#144726 (merge rustc_attr_data_structures into rustc_hir)
 - rust-lang/rust#144733 (fix: Match width of ascii and unicode secondary file start)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-cloud-vms bot pushed a commit to makai410/rustc_public that referenced this pull request Aug 20, 2025
@bors
Auto merge of #144740 - jdonszelmann:rollup-nprgqnm, r=jdonszelmann
d30af38 
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#144688 (Uniform `enter_trace_span!` and add documentation)
 - rust-lang/rust#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
 - rust-lang/rust#144711 (Consider operator's span when computing binop expr span)
 - rust-lang/rust#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
 - rust-lang/rust#144726 (merge rustc_attr_data_structures into rustc_hir)
 - rust-lang/rust#144733 (fix: Match width of ascii and unicode secondary file start)

r? `@ghost`
`@rustbot` modify labels: rollup
makai410 pushed a commit to makai410/rust that referenced this pull request Nov 10, 2025
@jdonszelmann
Rollup merge of rust-lang#144712 - nnethercote:dedup-num-types, r=fmease
1889702 
Deduplicate `IntTy`/`UintTy`/`FloatTy`.

There are identical definitions in `rustc_type_ir` and `rustc_ast`. This commit removes them and places a single definition in `rustc_ast_ir`. This requires adding `rust_span` as a dependency of `rustc_ast_ir`, but means a bunch of silly conversion functions can be removed.

r? `@fmease`
makai410 pushed a commit to makai410/rust that referenced this pull request Nov 10, 2025
@bors
Auto merge of rust-lang#144740 - jdonszelmann:rollup-nprgqnm, r=jdons…
4352e18 
…zelmann

Rollup of 6 pull requests

Successful merges:

 - rust-lang#144688 (Uniform `enter_trace_span!` and add documentation)
 - rust-lang#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
 - rust-lang#144711 (Consider operator's span when computing binop expr span)
 - rust-lang#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
 - rust-lang#144726 (merge rustc_attr_data_structures into rustc_hir)
 - rust-lang#144733 (fix: Match width of ascii and unicode secondary file start)

r? `@ghost`
`@rustbot` modify labels: rollup
Kobzol pushed a commit to Kobzol/rustc_codegen_gcc that referenced this pull request Dec 21, 2025
@bors
Auto merge of #144740 - jdonszelmann:rollup-nprgqnm, r=jdonszelmann
64c49f4 
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#144688 (Uniform `enter_trace_span!` and add documentation)
 - rust-lang/rust#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
 - rust-lang/rust#144711 (Consider operator's span when computing binop expr span)
 - rust-lang/rust#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
 - rust-lang/rust#144726 (merge rustc_attr_data_structures into rustc_hir)
 - rust-lang/rust#144733 (fix: Match width of ascii and unicode secondary file start)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fmease fmease fmease approved these changes

Assignees

@fmease fmease

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. PG-exploit-mitigations Project group: Exploit mitigations 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. 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.90.0

Development

Successfully merging this pull request may close these issues.

5 participants

@nnethercote @rustbot @rust-log-analyzer @fmease @bors