Deduplicate some rustc_middle function bodies by calling the rustc_type_ir equivalent
#139313
+67
−99
Conversation
This file contains 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
rustbot
added
S-waiting-on-review
compiler-errors
requested changes
Apr 3, 2025
There was a problem hiding this comment.
I think in principal this is nice, but it kinda irks me b/c I specifically wanted to avoid calling inherent layer functions from inside the compiler. That's why the code is duplicated in the first place, not b/c I didn't see that they could be deduplicated.
This is kinda obtuse, but I'd either rather keep the duplication for now, or could you pull these two bodies into some helper functions (not methods) and move them out of inherent.rs (maybe into like... impl_.rs with a module-level comment that the module is intended to hold duplicated snippets of code shared btw the compiler and middle layer, and shouldn't be caled directly).
I'm actually surprised that this doesn't trigger the lint for calling inherent methods that I literally added, which I'll probably be fixing because of this lol
…_type_ir` equivalent
oli-obk
force-pushed
the
push-uzvmpxqyvrzp
branch
from
5f61830 to
6189594
Compare
|
Makes sense ^^ How about this? |
hmm should have read this first. They are now TyKind methods ^^ would you still prefer the dedup module and free functions? |
|
|
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Apr 4, 2025
…ler-errors Deduplicate some `rustc_middle` function bodies by calling the `rustc_type_ir` equivalent Maybe in the future we can use method delegation, but I'd rather avoid that for now (I don't even know if it can do that already)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 4, 2025
Rollup of 14 pull requests Successful merges: - rust-lang#137869 (Demote i686-pc-windows-gnu to Tier 2) - rust-lang#137880 (Autodiff batching) - rust-lang#138546 (Add integer to string formatting tests) - rust-lang#138947 (Refactor Apple version handling in the compiler) - rust-lang#138950 (replace extra_filename with strict version hash in metrics file names) - rust-lang#139213 (Run coretests and alloctests with cg_clif in CI) - rust-lang#139274 (Rustdoc: typecheck settings.js) - rust-lang#139295 (Remove creation of duplicate `AnonPipe`) - rust-lang#139298 (Allow for missing invisible close delim when reparsing an expression.) - rust-lang#139313 (Deduplicate some `rustc_middle` function bodies by calling the `rustc_type_ir` equivalent) - rust-lang#139317 (compiletest: Encapsulate all of the code that touches libtest) - rust-lang#139322 (Add helper function for checking LLD usage to `run-make-support`) - rust-lang#139335 (Pass correct param-env to `error_implies`) - rust-lang#139342 (Add a mailmap entry for myself) Failed merges: - rust-lang#138949 (Rename `is_like_osx` to `is_like_darwin`) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 4, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#138949 (Rename `is_like_osx` to `is_like_darwin`) - rust-lang#139295 (Remove creation of duplicate `AnonPipe`) - rust-lang#139313 (Deduplicate some `rustc_middle` function bodies by calling the `rustc_type_ir` equivalent) - rust-lang#139317 (compiletest: Encapsulate all of the code that touches libtest) - rust-lang#139322 (Add helper function for checking LLD usage to `run-make-support`) - rust-lang#139335 (Pass correct param-env to `error_implies`) - rust-lang#139342 (Add a mailmap entry for myself) - rust-lang#139349 (adt_destructor: sanity-check returned item) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 4, 2025
Rollup merge of rust-lang#139313 - oli-obk:push-uzvmpxqyvrzp, r=compiler-errors Deduplicate some `rustc_middle` function bodies by calling the `rustc_type_ir` equivalent Maybe in the future we can use method delegation, but I'd rather avoid that for now (I don't even know if it can do that already)
Kobzol
pushed a commit
to Kobzol/rust
that referenced
this pull request
Apr 4, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#138949 (Rename `is_like_osx` to `is_like_darwin`) - rust-lang#139295 (Remove creation of duplicate `AnonPipe`) - rust-lang#139313 (Deduplicate some `rustc_middle` function bodies by calling the `rustc_type_ir` equivalent) - rust-lang#139317 (compiletest: Encapsulate all of the code that touches libtest) - rust-lang#139322 (Add helper function for checking LLD usage to `run-make-support`) - rust-lang#139335 (Pass correct param-env to `error_implies`) - rust-lang#139342 (Add a mailmap entry for myself) - rust-lang#139349 (adt_destructor: sanity-check returned item) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Maybe in the future we can use method delegation, but I'd rather avoid that for now (I don't even know if it can do that already)