Refractor a few more types to `rustc_type_ir` #79951

LeSeulArtichaut · 2020-12-12T00:10:19Z

In the continuation of #79169, ~~blocked on that PR~~.

This PR:

moves IntVarValue, FloatVarValue, InferTy (and friends) and Variance
creates the IntTy, UintTy and FloatTy enums in rustc_type_ir, based on their ast and chalk_ir equilavents, and uses them for types in the rest of the compiler.

~~I will split up that commit to make this easier to review and to have a better commit history.~~
EDIT: done, I split the PR in commits of 200-ish lines each

r? @nikomatsakis cc @jackh726

src/librustdoc/clean/types.rs

… ones in types

cjgillot · 2021-01-18T22:07:08Z

compiler/rustc_type_ir/src/lib.rs

 impl<CTX> HashStable<CTX> for DebruijnIndex {
    fn hash_stable(&self, ctx: &mut CTX, hasher: &mut StableHasher) {
        self.as_u32().hash_stable(ctx, hasher);
    }
 }
+
+impl<CTX> HashStable<CTX> for IntTy {


Since you are binging in rustc_macros, can all these impls be replaced by the adequate #[derive(HashStable)]?

#[derive(HashStable)] depends on rustc_middle:

rust/compiler/rustc_macros/src/hash_stable.rs

Lines 115 to 130 in 73f233b

s.bound_impl(

quote!(

::rustc_data_structures::stable_hasher::HashStable<

::rustc_middle::ich::StableHashingContext<'__ctx>,

>

),

quote! {

fn hash_stable(

&self,

__hcx: &mut ::rustc_middle::ich::StableHashingContext<'__ctx>,

__hasher: &mut ::rustc_data_structures::stable_hasher::StableHasher) {

#discriminant

match *self { #body }

}

},

)

Sorry, I meant HashStable_Generic. It does not depend on rustc_middle, instead it requires a HashStableContext trait at crate toplevel.

If that's better I'll do that 👍

cjgillot · 2021-01-18T22:08:06Z

compiler/rustc_middle/src/ty/cast.rs

 use rustc_macros::HashStable;

 /// Types that are represented as ints.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum IntTy {
-    U(ast::UintTy),
+    U(ty::UintTy),


I did not see a re-export of rustc_type_ir::UintTy in rustc_ast. Are both the same type?

I guess it could make sense to do that, but that means having rustc_ast depend on rustc_type_ir... 🤷‍♂️

nikomatsakis · 2021-01-26T21:11:22Z

@bors r+

Thanks @LeSeulArtichaut !

bors · 2021-01-26T21:11:24Z

📌 Commit e0d64b9 has been approved by nikomatsakis

nikomatsakis · 2021-01-26T21:11:33Z

@bors rollup

Rollup of 13 pull requests Successful merges: - rust-lang#70904 (Stabilize `Seek::stream_position` (feature `seek_convenience`)) - rust-lang#79951 (Refractor a few more types to `rustc_type_ir` ) - rust-lang#80868 (Print failure message on all tests that should panic, but don't) - rust-lang#81062 (Improve diagnostics for Precise Capture) - rust-lang#81277 (Make more traits of the From/Into family diagnostic items) - rust-lang#81284 (Make `-Z time-passes` less noisy) - rust-lang#81379 (Improve URLs handling) - rust-lang#81416 (Tweak suggestion for missing field in patterns) - rust-lang#81426 (const_evaluatable: expand abstract consts in try_unify) - rust-lang#81428 (compiletest: Add two more unit tests) - rust-lang#81430 (add const_evaluatable_checked test) - rust-lang#81433 (const_evaluatable: stop looking into type aliases) - rust-lang#81445 (Update cargo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Rustup for rust-lang/rust#79951 cc rust-lang/rust#81467

Refractor a few more types to `rustc_type_ir` In the continuation of rust-lang#79169, ~~blocked on that PR~~. This PR: - moves `IntVarValue`, `FloatVarValue`, `InferTy` (and friends) and `Variance` - creates the `IntTy`, `UintTy` and `FloatTy` enums in `rustc_type_ir`, based on their `ast` and `chalk_ir` equilavents, and uses them for types in the rest of the compiler. ~~I will split up that commit to make this easier to review and to have a better commit history.~~ EDIT: done, I split the PR in commits of 200-ish lines each r? `````@nikomatsakis````` cc `````@jackh726`````

rust-highfive assigned nikomatsakis Dec 12, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 12, 2020

jyn514 added A-type-system Area: Type system T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-traits Working group: Traits, https://internals.rust-lang.org/t/announcing-traits-working-group/6804 labels Dec 12, 2020

LeSeulArtichaut force-pushed the ty-ir branch 3 times, most recently from 68708ea to 181f860 Compare December 12, 2020 15:05