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

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
Show Stats 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 @@ fn normalize_projection(
&self,
projection: crate::ProjectionTy,
env: Arc<crate::TraitEnvironment>,
) -> Option<crate::Ty>;
) -> Ty;
#[salsa::invoke(trait_solve_wait)]
#[salsa::transparent]

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

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

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

@ -2880,7 +2880,12 @@ pub fn normalize_trait_assoc_type(
})
.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 {