Continue renaming the comparison traits #14534
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
| @@ -1436,7 +1436,7 @@ trait Circle : Shape { fn radius() -> f64; } | |||
| ~~~~ | |||
|
|
|||
| the syntax `Circle : Shape` means that types that implement `Circle` must also have an implementation for `Shape`. | |||
| Multiple supertraits are separated by `+`, `trait Circle : Shape + Eq { }`. | |||
| Multiple supertraits are separated by `+`, `trait Circle : Shape + PartialEq { }`. | |||
|
I agree that many of these renamings should not be |
|
I could also do that as part of this PR, but I was afraid of the bootstrapping concerns because |
|
Tidy issues: https://travis-ci.org/mozilla/rust/jobs/26356365 |
|
Tidy issues resolved. |
This is part of the ongoing renaming of the equality traits. See rust-lang#12517 for more details. All code using Eq/Ord will temporarily need to move to Partial{Eq,Ord} or the Total{Eq,Ord} traits. The Total traits will soon be renamed to {Eq,Ord}. cc rust-lang#12517 [breaking-change]
This commit adds the groundwork for the renaming of the Total{Eq,Ord} traits.
After this commit hits a snapshot, the traits can be renamed.
|
What's the timeline on moving things back to |
|
As soon as this hits a snapshot I will rename to |
bors
added a commit
that referenced
this pull request
May 31, 2014
This is part 2 of the saga of renaming the Partial/Total equality and comparison traits.
bors
added a commit
that referenced
this pull request
Jun 1, 2014
This completes the last stage of the renaming of the comparison hierarchy of traits. This change renames TotalEq to Eq and TotalOrd to Ord. In the future the new Eq/Ord will be filled out with their appropriate methods, but for now this change is purely a renaming change. This continues the work of #12517, continuing the work in #14534. This patch accomplishes the final rename of `TotalEq` to `TotalOrd`. I wanted to get this patch landed ASAP so we don't have to deal much with "where did `Eq` and `Ord` go?" I have yet to do another pruning pass over the compiler to change all usage of `PartialEq` to `Eq` where appropriate. I will do this soon as well.
lnicola
pushed a commit
to lnicola/rust
that referenced
this pull request
Jun 19, 2023
…anic, r=Veykril fix: derive source scope from syntax node to be transformed Fixes rust-lang#14534 When we use `PathTransform` for associated items of a trait, we have been feeding `SemanticsScope` for the trait definition to it as source scope. `PathTransform` uses the source scope to resolve paths in associated items to find which path to transform. In the course of path resolution, the scope is responsible for lowering `ast::MacroType`s (because they can be written within a path) using `AstIdMap` for the scope's `HirFileId`. The problem here is that when an associated item is generated by a macro, the scope for the trait is different from the scope for that associated item. The former can only resolve the top-level macros within the trait definition but not the macro calls generated by those top-level macros. We need the latter to resolve such nested macros. This PR makes sure that we pass `SemanticsScope` for each associated item we're applying path transformation to.
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.
This is part 2 of the saga of renaming the Partial/Total equality and comparison traits.