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

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

Revival of #111208, because github refuses to work correctly.

I've implemented most of the suggestions from #111208's reviews.

Exceptions:

ToPredicate and InstantiatedPredicates
- They are both not part of the predicate representation, but rather related things
- IMO they make more sense as submodules
One-off queries stuff
- I'm not sure where to put them
- An option could be ty::query (and move the macros in like ty::query::macros), but idk

I'd also like to split adt stuff at least a little, for example

mod adt {
    mod field {}
    mod variant {}
}

…odule (cute)

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

…odule (cute)

… module (cute)

…n little module (cute)

…derType}` to their own little module (cute)

… to their own 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

compiler-errors

Maybe let's see what @cjgillot thinks. Also this should be squashed at the end -- it doesn't necessarily need to be 1 commit, but also I think 40 commits is a bit excessive.

compiler-errors · 2023-05-12T19:01:45Z

compiler/rustc_middle/src/ty/region.rs

@@ -0,0 +1,3 @@
+use crate::ty::{BoundRegion, Placeholder};


You should just move it into sty with the rest of the region variants, then later if you want to break up sty, all the region variants can be moved into a file here. This file in its current state is kinda misleading, lmao

compiler-errors · 2023-05-12T19:02:32Z

compiler/rustc_middle/src/ty/predicate/to_predicate.rs

@@ -0,0 +1,103 @@
+use crate::ty::{


I still think that this should live in predicates. These are essentially just Into implementations for Predicate, and it's easier to just have them live with the types they're defined on.

I feel like we ought to just not have any of the predicate/ files and isntead put it all in predicate.rs there's barely anything in the submodules and they would fit in fine in predicate.rs

@compiler-errors Most of those are not implemented for Predicates though, so I'm not sure I follow...

@BoxyUwU I don't agree, having the same points as before: adding more entities to the same file makes it harder to add something there (it's easy to mess with the order) and harder to navigate... I can understand the reasoning behind having all predicate parts in a single file (after all, it's essentially a single thing split into multiple types), but I can't see the point in merging ToPredicate, InstantiatedPredicates and CratePredicatesMap there too.

Most of those are not implemented for Predicates though, so I'm not sure I follow...

What? Except for the blanket impl, almost all of these are turning PolyXPredicates into ty::Predicate.

compiler-errors · 2023-05-12T19:03:15Z

compiler/rustc_middle/src/ty/destructured_const.rs

@@ -0,0 +1,8 @@
+use crate::ty::{self, VariantIdx};


I think this probably should just live with the rest of the consts..

bors · 2023-05-15T03:54:54Z

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

cjgillot · 2023-05-16T12:50:05Z

compiler/rustc_ast_lowering/src/lib.rs

-    span_bug,
-    ty::{ResolverAstLowering, TyCtxt},
-};
+use rustc_middle::{resolver_outputs::ResolverAstLowering, span_bug, ty::TyCtxt};


Could you make 3 imports of this?

cjgillot · 2023-05-16T12:51:24Z

compiler/rustc_middle/src/cache.rs

+/// Contains information needed to resolve types and (in the future) look up
+/// the types of AST nodes.
+#[derive(Copy, Clone, PartialEq, Eq, Hash)]
+pub struct CReaderCacheKey {


This is should be in ty::context, close to its actual use.

cjgillot · 2023-05-16T12:52:37Z

compiler/rustc_middle/src/ty/closure_size_profile_data.rs

+
+#[derive(Clone, Debug, PartialEq, Eq, Copy, Hash, TyEncodable, TyDecodable, HashStable)]
+#[derive(TypeFoldable, TypeVisitable)]
+pub struct ClosureSizeProfileData<'tcx> {


In ty::closure or typeck_results, where it is used?

cjgillot · 2023-05-16T12:53:59Z

compiler/rustc_middle/src/ty/destructor.rs

+use rustc_hir::def_id::DefId;
+
+#[derive(Copy, Clone, Debug, HashStable, Encodable, Decodable)]
+pub struct Destructor {


In ty::adt?

cjgillot · 2023-05-16T12:54:51Z

compiler/rustc_middle/src/ty/crate_variances_map.rs

+/// `tcx.variances_of()` to get the variance for a *particular*
+/// item.
+#[derive(HashStable, Debug)]
+pub struct CrateVariancesMap<'tcx> {


Variances are mostly used in ty::relate, aren't they?

cjgillot · 2023-05-16T12:57:09Z

compiler/rustc_middle/src/ty/placeholder.rs

+/// another.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
+#[derive(HashStable, TyEncodable, TyDecodable)]
+pub struct Placeholder<T> {


In rustc_type_ir?

cjgillot · 2023-05-16T12:57:35Z

compiler/rustc_middle/src/ty/predicate/instantiated_predicates.rs

+/// like `Foo<isize,usize>`, then the `InstantiatedPredicates` would be `[[],
+/// [usize:Bar<isize>]]`.
+#[derive(Clone, Debug, TypeFoldable, TypeVisitable)]
+pub struct InstantiatedPredicates<'tcx> {


Should this go in ty::predicate too?

cjgillot · 2023-05-16T12:58:37Z

compiler/rustc_middle/src/ty/symbol_name.rs

+use crate::ty::TyCtxt;
+
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, TyEncodable, HashStable)]
+pub struct SymbolName<'tcx> {


In mir::mono?

cjgillot · 2023-05-16T12:59:22Z

compiler/rustc_middle/src/ty/ty_.rs

+pub type PlaceholderType = Placeholder<BoundTy>;
+
+#[derive(Debug, Default, Copy, Clone)]
+pub struct InferVarInfo {


This can be moved to rustc_hir_typeck.

cjgillot · 2023-05-16T12:59:42Z

compiler/rustc_middle/src/ty/ty_.rs

+/// Use this rather than `TyKind`, whenever possible.
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, HashStable)]
+#[rustc_diagnostic_item = "Ty"]
+#[rustc_pass_by_value]
+pub struct Ty<'tcx>(pub(super) Interned<'tcx, WithCachedTypeInfo<TyKind<'tcx>>>);
+
+pub type PlaceholderType = Placeholder<BoundTy>;


Those should be in sty until you get to break it.

apiraino · 2023-05-25T11:19:42Z

I see a few open comments so I think this can be switched to waiting on the author

@rustbot author

WaffleLapkin · 2023-07-18T16:23:53Z

This is not going anywhere in this state. I'll try to do smaller PRs that only move items of a certain theme, so that it's actually possible to review and do the changes (this is basically impossible to rebase).

WaffleLapkin · 2025-02-06T22:00:37Z

Status update: I did not in fact do smaller PRs. I still think that giant mod.rs is not the best, but oh well. Maybe I'll find time some day

WaffleLapkin added 30 commits May 12, 2023 10:36

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

4cb52ff

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

febb95e

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

7b9ec6c

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

2066470

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

83383d4

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

8830e66

…odule (cute)

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

e5893f4

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

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

fcfdd0e

…odule (cute)

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

dde5ea5

… module (cute)

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

fb2743d

…n little module (cute)

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

f0210a1

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

675b01f

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

33df1c9

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

709d355

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

2306e97

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

55811e0

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

3e53b05

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

9f88bf1

Move `ty::{Placeholder, PlaceholderConst, PlaceholderRegion, Placehol…

55f1d16

…derType}` to their own little module (cute)

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

9ca749d

Move/merge impls out of ty/mod.rs

4a10c11

Move ty::{ResolverAstLowering, ResolverGlobalCtxt, ResolverOutputs}…

9303663

… to their own little module (cute)

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

5107cb0

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

8409f98

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

9ef3c2f

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

f9de9fa

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

9d1cfec

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

Rearange [pub] uses

4ba55d5

group ty::coherence in one file

9175367

group ty::opaque in one file

14ec3a1

WaffleLapkin added 9 commits May 12, 2023 10:44

Move BoundConst to ty::consts

d4b6a6a

Group adt adjesent types into ty::adt

181df7a

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

33576fa

... and add `MainDefinition` to it

Group ty::Predicate internals in one file

ca46414

Move ParamTerm to term.rs

06add87

Destribute placeholders

65acff8

Move InferVarInfo to ty_.rs

8706a19

Move AliasRelationDirection to predicate.rs

a935652

Move CReaderCacheKey to rustc_middle::cache

5bb181a

rustbot assigned compiler-errors May 12, 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 12, 2023

WaffleLapkin mentioned this pull request May 12, 2023

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

Closed

compiler-errors reviewed May 12, 2023

View reviewed changes

cjgillot reviewed May 16, 2023

View reviewed changes

rustbot 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 25, 2023

WaffleLapkin closed this Jul 18, 2023

WaffleLapkin deleted the 🌸cutify_ty🌸 branch February 6, 2025 21:58

apiraino removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 7, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

WaffleLapkin commented May 12, 2023

compiler-errors left a comment

compiler-errors May 12, 2023

compiler-errors May 12, 2023

BoxyUwU May 13, 2023

WaffleLapkin May 16, 2023

compiler-errors May 16, 2023 •

edited

Loading

compiler-errors May 12, 2023

bors commented May 15, 2023

cjgillot May 16, 2023

cjgillot May 16, 2023

cjgillot May 16, 2023

cjgillot May 16, 2023

cjgillot May 16, 2023

cjgillot May 16, 2023

cjgillot May 16, 2023

cjgillot May 16, 2023

cjgillot May 16, 2023

cjgillot May 16, 2023

apiraino commented May 25, 2023

WaffleLapkin commented Jul 18, 2023

WaffleLapkin commented Feb 6, 2025

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

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

Conversation

WaffleLapkin commented May 12, 2023

compiler-errors left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

compiler-errors May 16, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bors commented May 15, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

apiraino commented May 25, 2023

WaffleLapkin commented Jul 18, 2023

WaffleLapkin commented Feb 6, 2025

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

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

compiler-errors May 16, 2023 •

edited

Loading