bahman/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove unused parameter from opt_alias_variances

Browse Source
This commit is contained in:
Waffle Lapkin
2026-04-16 14:26:26 +02:00
parent e8b6c9737e
commit 54abf6d683
9 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_borrowck/src/region_infer/opaque_types/member_constraints.rs
View File

@@ -177,7 +177,7 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for CollectMemberConstraintsVisitor<'_, '_,
| ty::Coroutine(def_id, args) => self.visit_closure_args(def_id, args),
ty::Alias(ty::AliasTy { kind, args, .. })
if let Some(variances) = self.cx().opt_alias_variances(kind, kind.def_id()) =>
if let Some(variances) = self.cx().opt_alias_variances(kind) =>
{
// Skip lifetime parameters that are not captured, since they do
// not need member constraints registered for them; we'll erase

2
compiler/rustc_borrowck/src/region_infer/opaque_types/mod.rs
View File

@@ -501,7 +501,7 @@ impl<'tcx> FallibleTypeFolder<TyCtxt<'tcx>> for ToArgRegionsFolder<'_, 'tcx> {
}
ty::Alias(ty::AliasTy { kind, args, .. })
if let Some(variances) = tcx.opt_alias_variances(kind, kind.def_id()) =>
if let Some(variances) = tcx.opt_alias_variances(kind) =>
{
let args = tcx.mk_args_from_iter(std::iter::zip(variances, args.iter()).map(
|(&v, s)| {

2
compiler/rustc_infer/src/infer/outlives/for_liveness.rs
View File

@@ -95,7 +95,7 @@ where
} else {
// Skip lifetime parameters that are not captured, since they do
// not need to be live.
let variances = tcx.opt_alias_variances(kind, kind.def_id());
let variances = tcx.opt_alias_variances(kind);
for (idx, s) in args.iter().enumerate() {
if variances.map(|variances| variances[idx]) != Some(ty::Bivariant) {

2
compiler/rustc_infer/src/infer/outlives/obligations.rs
View File

@@ -485,7 +485,7 @@ where
&& (alias_ty.has_infer_regions() || matches!(kind, ty::Opaque { .. }))
{
debug!("no declared bounds");
let opt_variances = self.tcx.opt_alias_variances(kind, kind.def_id());
let opt_variances = self.tcx.opt_alias_variances(kind);
self.args_must_outlive(alias_ty.args, origin, region, opt_variances);
return;
}

3
compiler/rustc_middle/src/ty/context/impl_interner.rs
View File

@@ -167,9 +167,8 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
fn opt_alias_variances(
self,
kind: impl Into<ty::AliasTermKind<'tcx>>,
def_id: DefId,
) -> Option<&'tcx [ty::Variance]> {
self.opt_alias_variances(kind, def_id)
self.opt_alias_variances(kind)
}
fn type_of(self, def_id: DefId) -> ty::EarlyBinder<'tcx, Ty<'tcx>> {

1
compiler/rustc_middle/src/ty/util.rs
View File

@@ -940,7 +940,6 @@ impl<'tcx> TyCtxt<'tcx> {
pub fn opt_alias_variances(
self,
kind: impl Into<ty::AliasTermKind<'tcx>>,
_def_id: DefId,
) -> Option<&'tcx [ty::Variance]> {
match kind.into() {
ty::AliasTermKind::ProjectionTy { def_id } => {

2
compiler/rustc_type_ir/src/interner.rs
View File

@@ -197,11 +197,9 @@ pub trait Interner:
type VariancesOf: Copy + Debug + SliceLike<Item = ty::Variance>;
fn variances_of(self, def_id: Self::DefId) -> Self::VariancesOf;
// TODO: remove `def_id` param after `AliasTermKind` contains `def_id` within
fn opt_alias_variances(
self,
kind: impl Into<ty::AliasTermKind<Self>>,
def_id: Self::DefId,
) -> Option<Self::VariancesOf>;
fn type_of(self, def_id: Self::DefId) -> ty::EarlyBinder<Self, Self::Ty>;

2
compiler/rustc_type_ir/src/outlives.rs
View File

@@ -226,7 +226,7 @@ pub fn compute_alias_components_recursive<I: Interner>(
alias_ty: ty::AliasTy<I>,
out: &mut SmallVec<[Component<I>; 4]>,
) {
let opt_variances = cx.opt_alias_variances(alias_ty.kind, alias_ty.kind.def_id());
let opt_variances = cx.opt_alias_variances(alias_ty.kind);
let mut visitor = OutlivesCollector { cx, out, visited: Default::default() };

2
compiler/rustc_type_ir/src/relate.rs
View File

@@ -220,7 +220,7 @@ impl<I: Interner> Relate<I> for ty::AliasTy<I> {
)))
} else {
let cx = relation.cx();
let args = if let Some(variances) = cx.opt_alias_variances(a.kind, a.kind.def_id()) {
let args = if let Some(variances) = cx.opt_alias_variances(a.kind) {
relate_args_with_variances(relation, variances, a.args, b.args)?
} else {
relate_args_invariantly(relation, a.args, b.args)?