Chore/move more types to ir

[Jamesbarford]

r? ghost

[lcnr]

why does this trait have to be moved? This is surprising to me

Might be good to write in the PR description what you're moving and why.

As in, sth like

• moving Ty
• also uses other types X which now need to be moved
• has function which relies on tcx, add method fn XXX to trait Interner

[lcnr]

?

[lcnr]

should be in a mod ty or mod sty to mirror rustc_middle

[lcnr]

dubious :3 i guess that's a way to simply the migration. Removing this before merge/add a TODO rn

[Jamesbarford]

Yeah I was experimenting with things. This in my opinion is 'cheating', I'll remove it

[lcnr]

where is this used?

[lcnr]

why by ref?

[lcnr]

should be item bound of I::Interned, same with all other where-bounds here

[lcnr]

all item bounds of Interned

[lcnr]

this feels rustc specific and is not used by r-a afaik, so I'd prefer keeping this in rustc_middle for now

[lcnr]

🤔 where is that used, surprising that we'd ever want to use this in rustc_next_trait_solver

[lcnr]

should be a super trait bounds of a single Interned trait

[lcnr]

please don't

[lcnr]

changes to rustc_next_trait_solver look as expected

don't need to change rust-analyzer for now as they don't directly depend on rustc. We need ot change it to test that it's correct, but I'd wait on actually getting rustc to work for this

View changes since this review

[lcnr]

TyDecoder should stay in rustc_middle 🤔

[lcnr]

why method on Interner insetead of Ty?

[lcnr]

same here

[lcnr]

can you, potentially in an earlier PR so that we can test it for perf, stop using self.types.X and instead use Ty::new_uint(..). This should inline to the same thing and means whether we have a precomputed interned type for u8 is not handled by the interner

[lcnr]

why? we should never import these traits 🤔

[Jamesbarford]

I believe it is due to have implemented IntoKind on Ty to expose the kind() method but then not made a pub fn kind(&self) pass-through method that previously existed. I would think once I've implemented the pass-through I can remove this. As for GenericArgs, it could possibly a similar reason

[lcnr]

this should lint 🤔 as we want people to consistently use Ty and import it from rustc_middle::ty. We should have some #[cfg_if("nightly", rustc_diagnostic_item = "Ty")] attribute on Ty

[lcnr]

:<

[lcnr]

From<Ty<Self>> should be super-trait of Term instead

[rust-log-analyzer]

The job x86_64-gnu-llvm-20 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

/dev/sda15      105M  6.2M   99M   6% /boot/efi
tmpfs           1.6G   12K  1.6G   1% /run/user/1001
================================================================================

Sufficient disk space available (95818632KB >= 52428800KB). Skipping cleanup.
##[group]Run echo "[CI_PR_NUMBER=$num]"
echo "[CI_PR_NUMBER=$num]"
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
---
set -ex

# Run a subset of tests. Used to run tests in parallel in multiple jobs.

# When this job partition is run as part of PR CI, skip tidy to allow revealing more failures. The
# dedicated `tidy` job failing won't block other PR CI jobs from completing, and so tidy failures
# shouldn't inhibit revealing other failures in PR CI jobs.
if [ "$PR_CI_JOB" == "1" ]; then
  echo "PR_CI_JOB set; skipping tidy"
  SKIP_TIDY="--skip tidy"
fi

../x.py --stage 2 test \
  ${SKIP_TIDY:+$SKIP_TIDY} \
  --skip compiler \
  --skip src
#!/bin/bash

set -ex

# Run a subset of tests. Used to run tests in parallel in multiple jobs.

# When this job partition is run as part of PR CI, skip tidy to allow revealing more failures. The
# dedicated `tidy` job failing won't block other PR CI jobs from completing, and so tidy failures
# shouldn't inhibit revealing other failures in PR CI jobs.
if [ "$PR_CI_JOB" == "1" ]; then
  echo "PR_CI_JOB set; skipping tidy"
  SKIP_TIDY="--skip tidy"
fi

../x.py --stage 2 test \
  ${SKIP_TIDY:+$SKIP_TIDY} \
  --skip tests \
  --skip coverage-map \
  --skip coverage-run \
  --skip library \
  --skip tidyselftest
---

error[E0106]: missing lifetime specifier
   --> compiler/rustc_type_ir/src/interner.rs:467:46
    |
467 |     fn get_ty_var(self, id: usize) -> Option<&Ty<Self>>;
    |                                              ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
help: consider using the `'static` lifetime, but this is uncommon unless you're returning a borrowed value from a `const` or a `static`
    |
467 |     fn get_ty_var(self, id: usize) -> Option<&'static Ty<Self>>;
    |                                               +++++++
help: instead, you are more likely to want to return an owned value
    |
467 -     fn get_ty_var(self, id: usize) -> Option<&Ty<Self>>;
467 +     fn get_ty_var(self, id: usize) -> Option<Ty<Self>>;
    |

error[E0106]: missing lifetime specifier
   --> compiler/rustc_type_ir/src/interner.rs:469:48
    |
469 |     fn get_fresh_ty(self, id: usize) -> Option<&Ty<Self>>;
    |                                                ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
help: consider using the `'static` lifetime, but this is uncommon unless you're returning a borrowed value from a `const` or a `static`
    |
469 |     fn get_fresh_ty(self, id: usize) -> Option<&'static Ty<Self>>;
    |                                                 +++++++
help: instead, you are more likely to want to return an owned value
    |
469 -     fn get_fresh_ty(self, id: usize) -> Option<&Ty<Self>>;
469 +     fn get_fresh_ty(self, id: usize) -> Option<Ty<Self>>;
    |

error[E0106]: missing lifetime specifier
   --> compiler/rustc_type_ir/src/interner.rs:471:52
    |
471 |     fn get_fresh_ty_int(self, id: usize) -> Option<&Ty<Self>>;
    |                                                    ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
help: consider using the `'static` lifetime, but this is uncommon unless you're returning a borrowed value from a `const` or a `static`
    |
471 |     fn get_fresh_ty_int(self, id: usize) -> Option<&'static Ty<Self>>;
    |                                                     +++++++
help: instead, you are more likely to want to return an owned value
    |
471 -     fn get_fresh_ty_int(self, id: usize) -> Option<&Ty<Self>>;
471 +     fn get_fresh_ty_int(self, id: usize) -> Option<Ty<Self>>;
    |

error[E0106]: missing lifetime specifier
   --> compiler/rustc_type_ir/src/interner.rs:473:54
    |
473 |     fn get_fresh_ty_float(self, id: usize) -> Option<&Ty<Self>>;
    |                                                      ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
help: consider using the `'static` lifetime, but this is uncommon unless you're returning a borrowed value from a `const` or a `static`
    |
473 |     fn get_fresh_ty_float(self, id: usize) -> Option<&'static Ty<Self>>;
    |                                                       +++++++
help: instead, you are more likely to want to return an owned value
    |
473 -     fn get_fresh_ty_float(self, id: usize) -> Option<&Ty<Self>>;
473 +     fn get_fresh_ty_float(self, id: usize) -> Option<Ty<Self>>;
    |

error[E0106]: missing lifetime specifier
   --> compiler/rustc_type_ir/src/interner.rs:475:53
    |
475 |     fn get_anon_bound_ty(self, id: usize) -> Option<&Vec<Ty<Self>>>;
    |                                                     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
help: consider using the `'static` lifetime, but this is uncommon unless you're returning a borrowed value from a `const` or a `static`
    |
475 |     fn get_anon_bound_ty(self, id: usize) -> Option<&'static Vec<Ty<Self>>>;
    |                                                      +++++++
help: instead, you are more likely to want to return an owned value
    |
475 -     fn get_anon_bound_ty(self, id: usize) -> Option<&Vec<Ty<Self>>>;
475 +     fn get_anon_bound_ty(self, id: usize) -> Option<Vec<Ty<Self>>>;
    |

error[E0106]: missing lifetime specifier
   --> compiler/rustc_type_ir/src/interner.rs:477:63
    |
477 |     fn get_anon_canonical_bound_ty(self, id: usize) -> Option<&Ty<Self>>;
    |                                                               ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
help: consider using the `'static` lifetime, but this is uncommon unless you're returning a borrowed value from a `const` or a `static`
    |
477 |     fn get_anon_canonical_bound_ty(self, id: usize) -> Option<&'static Ty<Self>>;
    |                                                                +++++++
help: instead, you are more likely to want to return an owned value
    |
477 -     fn get_anon_canonical_bound_ty(self, id: usize) -> Option<&Ty<Self>>;
477 +     fn get_anon_canonical_bound_ty(self, id: usize) -> Option<Ty<Self>>;
    |

error[E0425]: cannot find type `Mutability` in this scope
   --> compiler/rustc_type_ir/src/inherent.rs:102:46
    |
102 |     fn new_ptr(interner: I, ty: Self, mutbl: Mutability) -> Self;
    |                                              ^^^^^^^^^^ not found in this scope
    |
help: consider importing one of these enums
    |
  6 + use crate::Mutability;
    |
  6 + use rustc_ast_ir::Mutability;
    |

error[E0425]: cannot find type `Mutability` in this scope
   --> compiler/rustc_type_ir/src/inherent.rs:104:65
    |
104 |     fn new_ref(interner: I, region: I::Region, ty: Self, mutbl: Mutability) -> Self;
    |                                                                 ^^^^^^^^^^ not found in this scope
    |
help: consider importing one of these enums
    |
  6 + use crate::Mutability;
    |
  6 + use rustc_ast_ir::Mutability;
    |

error[E0425]: cannot find value `index` in this scope
    --> compiler/rustc_type_ir/src/binder.rs:1673:61
     |
1673 |             && let Some(inner) = interner.get_anon_bound_ty(index.as_usize())
     |                                                             ^^^^^ not found in this scope
     |
help: consider importing one of these constants
     |
   1 + use crate::binder::sym::index;