Split astconv.rs into its own submodule
#75711
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
rust-highfive
added
the
S-waiting-on-review
|
Might I add: the file is still big, at 2.6k LoC. Splitting the error methods (complain_*) is harder and the file would still be over 2k LoC. I really didn't want to break anything do I avoided doing that, but I'd be willing to if you think it'd be better. |
oli-obk
reviewed
Aug 20, 2020
oli-obk
reviewed
Aug 20, 2020
CohenArthur
force-pushed
the
split-up-astconv
branch
2 times, most recently
from
0c9bd98
to
19c7072
Compare
oli-obk
reviewed
Aug 20, 2020
oli-obk
reviewed
Aug 20, 2020
CohenArthur
force-pushed
the
split-up-astconv
branch
2 times, most recently
from
85bf7ad
to
49c31d1
Compare
To separate the astconv.rs file, I split it into its own module with a subtrait called GenericAstConv. This subtrait handles methods related to generics, be it types or lifetimes. typeck: Add bounds module and Bounds struct bounds: Run fmt, add documentation generic_astconv: Add subtrait GenericAstConv Some methods of AstConv deal exclusively with Generics. Therefore, it makes sense to have them in their own trait. Some other methods from AstConv might be added to it later generic_astconv: Add more methods from AstConv Add check_generic_arg_count_for_call() and check_generic_arg_count() astconv: Add module for clarity generic: Rename GenericAstConv -> AstConvGeneric generic: add more methods to AstConvGeneric astconv: Remove AstConvGeneric trait, add impl dyn AstConv in other module astconv: Add errors module to handle AstConv complaints fmt: format code in astconv/ astconv: Remove old file astconv: Fix visibility on GenericArgPosition astconv: Fix visibility on GenericArgPosition astconv: Fix function visibility on other originally private functions
CohenArthur
force-pushed
the
split-up-astconv
branch
from
c0ad3b6
to
e6642e4
Compare
|
@bors r+ Thanks! |
|
📌 Commit e6642e4 has been approved by |
bors
added
S-waiting-on-bors
|
@oli-obk thanks to you for the helpful reviews ! |
|
@bors p=1 |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 22, 2020
Rollup of 12 pull requests Successful merges: - rust-lang#75705 (Move to intra-doc links for /library/core/src/intrinsics.rs) - rust-lang#75711 (Split `astconv.rs` into its own submodule) - rust-lang#75718 (Don't count variants/fields/consts/associated types in doc-coverage doc examples) - rust-lang#75725 (Use intra-doc-links in `alloc`) - rust-lang#75745 (Remove duplication in `fold_item`) - rust-lang#75753 (Another motivation for CFG: return-oriented programming) - rust-lang#75769 (Minor, remove double nesting of a test module) - rust-lang#75771 (Extend normalization in const-eval-query-stack test) - rust-lang#75781 (More inline asm register name fixups for LLVM) - rust-lang#75782 (Convert core/src/str/pattern.rs to Intra-doc links) - rust-lang#75787 (Use intra-doc-links in `core::ops::*`) - rust-lang#75788 (MIR call terminator represents diverging calls too) Failed merges: - rust-lang#75773 (Introduce expect snapshot testing library into rustc) r? @ghost
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.
Fixes #67418
This changed induced a few changes across the Type checker, but only there. Mostly, it was just renaming
Self::into something else to call specific methods from a subtrait instead of having a 2500+ lines one.I split up the
astconv.rsfile into its own module. This way, directives such asare still valid, and doing
is possible
(instead of having two modules, one named
astconv_generic.rsfor example andastconv.rs)I'm not entirely sure that the name
AstConvGenericis a good one. However, only methods related to lifetimes or generics have been moved over to this module. Sorry about the large diff.I'd be very happy to make any correction you deem necessary.
r? @oli-obk