Refactor tcx mk_const parameters. #103984
Merged
Conversation
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
rustbot
added
S-waiting-on-review
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 5, 2022
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#103868 (Use `TraitEngine` (by itself) less) - rust-lang#103878 (Fix artifact version/channel detection for stable) - rust-lang#103946 (Cleanup bind_pattern args) - rust-lang#103956 (Make mir opt unused file check blessable) - rust-lang#103977 (LLVM 16: Switch to using MemoryEffects) - rust-lang#103980 (rustdoc: simplify search results CSS and DOM) - rust-lang#103984 (Refactor tcx mk_const parameters.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
oli-obk
reviewed
Nov 5, 2022
| @@ -2569,9 +2569,14 @@ impl<'tcx> TyCtxt<'tcx> { | |||
| self.mk_ty_infer(TyVar(v)) | |||
| } | |||
|
|
|||
| #[inline] | |||
| pub fn mk_const(self, kind: ty::ConstKind<'tcx>, ty: Ty<'tcx>) -> Const<'tcx> { | |||
There was a problem hiding this comment.
Follow up idea:
Use kind: impl Into<ty::ConstKind<'tcx>> and remove mk_const_var, mk_const_param and mk_const_infer by adding the approriate From impls. Could also add one for ty::UnevaluatedConst, PlaceholderConst and ValTree and adjust the call sites sites to rely on the new impl
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.
Unroll the
ty::ConstSparameter toTyCtxt::mk_constinto separatety::ConstKindandTyparameters.Signature change is in:
https://github.com/V0ldek/rust/blob/c97fd8183a98d6a89b8fc2e02eb068298e6fb7dc/compiler/rustc_middle/src/ty/context.rs#L2234
and
https://github.com/V0ldek/rust/blob/c97fd8183a98d6a89b8fc2e02eb068298e6fb7dc/compiler/rustc_middle/src/ty/context.rs#L2572-L2575
the rest is callsites.
Closes #103974
r? @oli-obk