Rename TyData to TyKind #628
Merged
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
nathanwhit
suggested changes
Oct 21, 2020
book/src/types/rust_types.md
Outdated
| @@ -165,13 +165,13 @@ other type without any effect, and so forth. | |||
|
|
|||
| ## Mapping to rustc types | |||
|
|
|||
| The rustc [`TyKind`] enum has a lot more variants than chalk. This | |||
| The rustc [`TyVariableKind`] enum has a lot more variants than chalk. This | |||
There was a problem hiding this comment.
These should stay as TyKind, so just s/TyVariableKind/TyKind in the book (should fix the link too)
chalk-ir/src/lib.rs
Outdated
| pub fn inference_var(&self, interner: &I) -> Option<InferenceVar> { | ||
| if let TyData::InferenceVar(depth, _) = self.data(interner) { | ||
| if let TyKind::InferenceVar(depth, _) = &self.data(interner).kind { |
There was a problem hiding this comment.
self.data(interner).kind -> self.kind(interner) here and in the rest of chalk-ir
chalk-ir/src/lib.rs
Outdated
| @@ -2431,8 +2447,8 @@ impl<I: Interner> Substitution<I> { | |||
| self.iter(interner).zip(0..).all(|(generic_arg, index)| { | |||
| let index_db = BoundVar::new(DebruijnIndex::INNERMOST, index); | |||
| match generic_arg.data(interner) { | |||
| GenericArgData::Ty(ty) => match ty.data(interner) { | |||
| TyData::BoundVar(depth) => index_db == *depth, | |||
| GenericArgData::Ty(ty) => match &ty.data(interner).kind { | |||
There was a problem hiding this comment.
ty.data(interner).kind -> ty.kind(interner
|
@bors r=nathanwhit |
|
📌 Commit 21b44ab has been approved by |
|
☀️ Test successful - checks-actions |
Merged
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.
Part of #627