Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/variance.rs')
-rw-r--r--crates/hir-ty/src/variance.rs19
1 files changed, 9 insertions, 10 deletions
diff --git a/crates/hir-ty/src/variance.rs b/crates/hir-ty/src/variance.rs
index 4e9aa5610a..6e1cd9a310 100644
--- a/crates/hir-ty/src/variance.rs
+++ b/crates/hir-ty/src/variance.rs
@@ -22,7 +22,6 @@ use crate::{
use chalk_ir::Mutability;
use hir_def::signatures::StructFlags;
use hir_def::{AdtId, GenericDefId, GenericParamId, VariantId};
-use salsa::CycleRecoveryAction;
use std::fmt;
use std::ops::Not;
use stdx::never;
@@ -55,14 +54,14 @@ pub(crate) fn variances_of(db: &dyn HirDatabase, def: GenericDefId) -> Option<Ar
variances.is_empty().not().then(|| Arc::from_iter(variances))
}
-pub(crate) fn variances_of_cycle_fn(
- _db: &dyn HirDatabase,
- _result: &Option<Arc<[Variance]>>,
- _count: u32,
- _def: GenericDefId,
-) -> CycleRecoveryAction<Option<Arc<[Variance]>>> {
- CycleRecoveryAction::Iterate
-}
+// pub(crate) fn variances_of_cycle_fn(
+// _db: &dyn HirDatabase,
+// _result: &Option<Arc<[Variance]>>,
+// _count: u32,
+// _def: GenericDefId,
+// ) -> salsa::CycleRecoveryAction<Option<Arc<[Variance]>>> {
+// salsa::CycleRecoveryAction::Iterate
+// }
pub(crate) fn variances_of_cycle_initial(
db: &dyn HirDatabase,
@@ -966,7 +965,7 @@ struct S3<T>(S<T, T>);
struct FixedPoint<T, U, V>(&'static FixedPoint<(), T, U>, V);
"#,
expect![[r#"
- FixedPoint[T: covariant, U: covariant, V: covariant]
+ FixedPoint[T: bivariant, U: bivariant, V: bivariant]
"#]],
);
}