itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Re-enable fixpoint iteration for variance computation"

Browse Source
This commit is contained in:
Chayim Refael Friedman 2025-07-08 23:41:22 +03:00 committed by GitHub
parent 9a1fc3cdb8
commit 43644ca4fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/hir-expand/src/name.rs
View File

@ -179,10 +179,9 @@ impl Name {
self.symbol.as_str() self.symbol.as_str()
} }
#[inline]
pub fn display<'a>( pub fn display<'a>(
&'a self, &'a self,
db: &dyn salsa::Database, db: &dyn crate::db::ExpandDatabase,
edition: Edition, edition: Edition,
) -> impl fmt::Display + 'a { ) -> impl fmt::Display + 'a {
_ = db; _ = db;

5
crates/hir-ty/src/db.rs
View File

@ -273,8 +273,9 @@ pub trait HirDatabase: DefDatabase + std::fmt::Debug {
#[salsa::invoke(crate::variance::variances_of)] #[salsa::invoke(crate::variance::variances_of)]
#[salsa::cycle( #[salsa::cycle(
cycle_fn = crate::variance::variances_of_cycle_fn, // cycle_fn = crate::variance::variances_of_cycle_fn,
cycle_initial = crate::variance::variances_of_cycle_initial, // cycle_initial = crate::variance::variances_of_cycle_initial,
cycle_result = crate::variance::variances_of_cycle_initial,
)] )]
fn variances_of(&self, def: GenericDefId) -> Option<Arc<[crate::variance::Variance]>>; fn variances_of(&self, def: GenericDefId) -> Option<Arc<[crate::variance::Variance]>>;

18
crates/hir-ty/src/variance.rs
View File

@ -54,14 +54,14 @@ pub(crate) fn variances_of(db: &dyn HirDatabase, def: GenericDefId) -> Option<Ar
variances.is_empty().not().then(|| Arc::from_iter(variances)) variances.is_empty().not().then(|| Arc::from_iter(variances))
} }
pub(crate) fn variances_of_cycle_fn( // pub(crate) fn variances_of_cycle_fn(
_db: &dyn HirDatabase, // _db: &dyn HirDatabase,
_result: &Option<Arc<[Variance]>>, // _result: &Option<Arc<[Variance]>>,
_count: u32, // _count: u32,
_def: GenericDefId, // _def: GenericDefId,
) -> salsa::CycleRecoveryAction<Option<Arc<[Variance]>>> { // ) -> salsa::CycleRecoveryAction<Option<Arc<[Variance]>>> {
salsa::CycleRecoveryAction::Iterate // salsa::CycleRecoveryAction::Iterate
} // }
pub(crate) fn variances_of_cycle_initial( pub(crate) fn variances_of_cycle_initial(
db: &dyn HirDatabase, db: &dyn HirDatabase,
@ -965,7 +965,7 @@ struct S3<T>(S<T, T>);
struct FixedPoint<T, U, V>(&'static FixedPoint<(), T, U>, V); struct FixedPoint<T, U, V>(&'static FixedPoint<(), T, U>, V);
"#, "#,
expect![[r#" expect![[r#"
FixedPoint[T: covariant, U: covariant, V: covariant] FixedPoint[T: bivariant, U: bivariant, V: bivariant]
"#]], "#]],
); );
} }