language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove unnecessary Option

Browse source
This commit is contained in:
Ryo Yoshida 2022-09-13 01:52:16 +09:00
parent efb56160c9
commit d223c28c7d
No known key found for this signature in database
GPG key ID: E25698A930586171
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/hir-ty/src/db.rs
View file

@ -156,7 +156,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
&self, &self,
projection: crate::ProjectionTy, projection: crate::ProjectionTy,
env: Arc<crate::TraitEnvironment>, env: Arc<crate::TraitEnvironment>,
) -> Option<crate::Ty>; ) -> Ty;
#[salsa::invoke(trait_solve_wait)] #[salsa::invoke(trait_solve_wait)]
#[salsa::transparent] #[salsa::transparent]

6
crates/hir-ty/src/traits.rs
View file

@ -69,10 +69,10 @@ pub(crate) fn normalize_projection_query(
db: &dyn HirDatabase, db: &dyn HirDatabase,
projection: ProjectionTy, projection: ProjectionTy,
env: Arc<TraitEnvironment>, env: Arc<TraitEnvironment>,
) -> Option<Ty> { ) -> Ty {
let mut table = InferenceTable::new(db, env.clone()); let mut table = InferenceTable::new(db, env);
let ty = table.normalize_projection_ty(projection); let ty = table.normalize_projection_ty(projection);
Some(table.resolve_completely(ty)) table.resolve_completely(ty)
} }
/// Solve a trait goal using Chalk. /// Solve a trait goal using Chalk.

7
crates/hir/src/lib.rs
View file

@ -2880,7 +2880,12 @@ impl Type {
}) })
.build(); .build();
db.normalize_projection(projection, self.env.clone()).map(|ty| self.derived(ty)) let ty = db.normalize_projection(projection, self.env.clone());
if ty.is_unknown() {
None
} else {
Some(self.derived(ty))
}
} }
pub fn is_copy(&self, db: &dyn HirDatabase) -> bool { pub fn is_copy(&self, db: &dyn HirDatabase) -> bool {