Move structures from `ty/mod.rs` into their own modules #111208

WaffleLapkin · 2023-05-04T16:46:24Z

The main goal here is to allow easier maintenance of each individual structure, but this may help us make better module structure as well.

r? @oli-obk (you are usually ok with my big dumb refactoring PRs (also I'm sorry))

compiler/rustc_hir_typeck/src/fn_ctxt/adjust_fulfillment_errors.rs

compiler-errors · 2023-05-04T17:28:56Z

This is a lot of submodules :/ Is there any way of grouping these up into something a bit more coherent than "one module per type"?

WaffleLapkin · 2023-05-04T17:32:09Z

@compiler-errors there probably is, but my point was that with small submodules it's easier to group them, so this is the first step.

compiler-errors · 2023-05-04T17:32:28Z

I understand the approach, but I don't think there should be, for example, a separate submodule for all the different predicate internals (clause, typredicate, projection pred, etc.).

Same with ty, term, paramterm which are conceptually grouped. Same with ADT internals (fields, variants, etc.) all should probably live together in one module** (typo).

Impl header stuff and coherence iternals (ImplHeader, ImplOverlapKind, ImplSubject) should all probably live together in one place.

Bound const should live with const related stuff.

Also this is a lot of commits for just moving stuff around...

compiler-errors

Sorry, here's a slightly messier but more concise summary of all the groupings I think need to be done here.

As I said before, I think the philosophy of breaking up rustc_middle::ty into more coherent groupings is a good idea, but this needs some refactoring hehe.

compiler/rustc_middle/src/ty/alias_relation_direction.rs

compiler/rustc_middle/src/ty/bound_const.rs

compiler/rustc_middle/src/ty/bound_constness.rs

compiler/rustc_middle/src/ty/c_reader_cache_key.rs

compiler/rustc_middle/src/ty/crate_inherent_impls.rs

compiler-errors · 2023-05-04T17:54:20Z

compiler/rustc_middle/src/ty/ty_.rs

@@ -0,0 +1,9 @@
+use crate::ty::{Interned, TyKind, WithCachedTypeInfo};


there shouldn't be both an sty and ty i think lol

Yeah, I'll work on sty after this PR 😅

compiler/rustc_middle/src/ty/variant_def.rs

compiler/rustc_middle/src/ty/variant_discr.rs

compiler/rustc_middle/src/ty/variant_flags.rs

compiler-errors · 2023-05-04T17:54:59Z

compiler/rustc_middle/src/ty/visibility.rs

+use crate::ty::TyCtxt;
+
+#[derive(Clone, Debug, PartialEq, Eq, Copy, Hash, Encodable, Decodable, HashStable)]
+pub enum Visibility<Id = LocalDefId> {


idk... maybe this should live with adt stuff? even tho vis is used for more than that... i guess it's fine to live alone here.

Probably a submodule of rustc_middle::middle.

compiler/rustc_middle/src/ty/main_definition.rs

compiler/rustc_middle/src/ty/resolver_outputs.rs

bors · 2023-05-08T11:27:40Z

☔ The latest upstream changes (presumably #111342) made this pull request unmergeable. Please resolve the merge conflicts.

…odule (cute)

…tlivesPredicate, RegionOutlivesPredicate, TypeOutlivesPredicate}` to their own little module (cute)

…odule (cute)

… module (cute)

…n little module (cute)

…InherentImpls, CrateVariancesMap, Destructor, DestructuredConst, ImplHeader, ImplOverlapKind, ImplSubject, InferVarInfo, OpaqueTypeKey, VariantDiscr, VariantFlags}` to their own little modules (cute)

... and add `MainDefinition` to it

WaffleLapkin · 2023-05-08T14:29:59Z

Github borked my PR again, ugh. Sorry for the pings, everyone. Closing as this seems to be beyond repair similarly to #110795. Will open a new version.

WaffleLapkin · 2023-05-08T14:31:09Z

Nevermind, this time close+reopen actually helped.

bors · 2023-05-09T00:50:20Z

☔ The latest upstream changes (presumably #111358) made this pull request unmergeable. Please resolve the merge conflicts.

WaffleLapkin · 2023-05-12T11:24:51Z

Github is being weird again, so I've reopened the PR here: #111503

rustbot assigned oli-obk May 4, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 4, 2023

This comment has been minimized.

Sign in to view

compiler-errors reviewed May 4, 2023

View reviewed changes

compiler/rustc_hir_typeck/src/fn_ctxt/adjust_fulfillment_errors.rs Outdated Show resolved Hide resolved

compiler-errors reviewed May 4, 2023

View reviewed changes

compiler-errors self-assigned this May 4, 2023

WaffleLapkin added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 4, 2023

cjgillot reviewed May 5, 2023

View reviewed changes

compiler/rustc_middle/src/ty/main_definition.rs Outdated Show resolved Hide resolved

cjgillot reviewed May 5, 2023

View reviewed changes

compiler/rustc_middle/src/ty/resolver_outputs.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

WaffleLapkin added 14 commits May 8, 2023 12:55

Move ty::Visibility to its own little module (cute)

e467f43

Move ty::ImplPolarity to its own little module (cute)

5854e46

Move ty::BoundConstness to its own little module (cute)

9990165

Move ty::{Predicate, PredicateKind} to their own little module (cute)

05c8728

Move ty::InstantiatedPredicates to its own little module (cute)

fb29d65

Move ty::{TraitPredicate, PolyTraitPredicate} to their own little m…

c19b3f1

…odule (cute)

Move `ty::{OutlivesPredicate, PolyRegionOutlivesPredicate, PolyTypeOu…

7ca97d1

…tlivesPredicate, RegionOutlivesPredicate, TypeOutlivesPredicate}` to their own little module (cute)

Move ty::{PolyTraitPredicate, TraitPredicate} to their own little m…

81f69a3

…odule (cute)

Move ty::{CoercePredicate, PolyCoercePredicate} to their own little…

94d522e

… module (cute)

Move ty::{PolyProjectionPredicate, ProjectionPredicate} to their ow…

8a600a3

…n little module (cute)

Move ty::ToPredicate to its own little module (cute)

64c7cc2

Move ty::{ParamEnv, ParamEnvAnd} to their own little module (cute)

528e9b5

Move ty::{Term, TermKind} to their own little module (cute)

24c89cd

Move ty::Ty to its own little module (cute)

79f92ae

WaffleLapkin added 15 commits May 8, 2023 12:55

Move ty::Clause to its own little module (cute)

5e441b8

Move ty::CratePredicatesMap to its own little module (cute)

7a41522

Move ty::ImplTraitInTraitData to its own little module (cute)

a1e3cb4

Move `ty::{BoundConst, CReaderCacheKey, ClosureSizeProfileData, Crate…

9acb574

…InherentImpls, CrateVariancesMap, Destructor, DestructuredConst, ImplHeader, ImplOverlapKind, ImplSubject, InferVarInfo, OpaqueTypeKey, VariantDiscr, VariantFlags}` to their own little modules (cute)

Rearange [pub] uses

3c941b2

group ty::coherence in one file

2c556f5

group ty::opaque in one file

a04bd9b

Move BoundConst to ty::consts

335f7ca

Group adt adjesent types into ty::adt

b6237e6

Move rustc_middle::{ty=>}::resolver_outputs

413370b

... and add `MainDefinition` to it

Group ty::Predicate internals in one file

e3de992

Move ParamTerm to term.rs

07e0e75

Destribute placeholders

fa016bc

Move InferVarInfo to ty_.rs

5793896

Move AliasRelationDirection to predicate.rs

7fad53e

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels May 8, 2023

This comment was marked as off-topic.

Sign in to view

WaffleLapkin closed this May 8, 2023

WaffleLapkin reopened this May 8, 2023

WaffleLapkin removed A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels May 8, 2023

WaffleLapkin closed this May 12, 2023

WaffleLapkin mentioned this pull request May 12, 2023

Move structures from ty/mod.rs into their own modules #111503

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move structures from `ty/mod.rs` into their own modules #111208

Move structures from `ty/mod.rs` into their own modules #111208

WaffleLapkin commented May 4, 2023 •

edited

Loading

This comment has been minimized.

compiler-errors commented May 4, 2023

WaffleLapkin commented May 4, 2023

compiler-errors commented May 4, 2023 •

edited

Loading

compiler-errors left a comment

compiler-errors May 4, 2023

WaffleLapkin May 4, 2023

compiler-errors May 4, 2023

cjgillot May 5, 2023

This comment has been minimized.

bors commented May 8, 2023

This comment was marked as off-topic.

WaffleLapkin commented May 8, 2023

WaffleLapkin commented May 8, 2023

bors commented May 9, 2023

WaffleLapkin commented May 12, 2023

		@@ -0,0 +1,9 @@
		use crate::ty::{Interned, TyKind, WithCachedTypeInfo};

Move structures from ty/mod.rs into their own modules #111208

Move structures from ty/mod.rs into their own modules #111208

Conversation

WaffleLapkin commented May 4, 2023 • edited Loading

This comment has been minimized.

compiler-errors commented May 4, 2023

WaffleLapkin commented May 4, 2023

compiler-errors commented May 4, 2023 • edited Loading

compiler-errors left a comment

Choose a reason for hiding this comment

compiler-errors May 4, 2023

Choose a reason for hiding this comment

WaffleLapkin May 4, 2023

Choose a reason for hiding this comment

compiler-errors May 4, 2023

Choose a reason for hiding this comment

cjgillot May 5, 2023

Choose a reason for hiding this comment

This comment has been minimized.

bors commented May 8, 2023

This comment was marked as off-topic.

WaffleLapkin commented May 8, 2023

WaffleLapkin commented May 8, 2023

bors commented May 9, 2023

WaffleLapkin commented May 12, 2023

Move structures from `ty/mod.rs` into their own modules #111208

Move structures from `ty/mod.rs` into their own modules #111208

WaffleLapkin commented May 4, 2023 •

edited

Loading

compiler-errors commented May 4, 2023 •

edited

Loading