Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable clippy::manual_flatten (#8739)

Browse source 
This PR enables the
[`clippy::manual_flatten`](https://rust-lang.github.io/rust-clippy/master/index.html#/manual_flatten)
rule and fixes the outstanding violations.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-03-02 20:28:26 -05:00 • committed by GitHub
parent f79f56f8b4
commit 503bebaacc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 20 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/semantic_index/src/db.rs
View file

@ -278,11 +278,7 @@ impl VectorDatabase {
let worktree_id = worktree_query
.query_row(params![worktree_root_path], |row| Ok(row.get::<_, i64>(0)?));
if worktree_id.is_ok() {
return Ok(true);
} else {
return Ok(false);
}
Ok(worktree_id.is_ok())
})
}
@ -302,17 +298,15 @@ impl VectorDatabase {
let digests = Rc::new(
digests
.into_iter()
.map(|p| Value::Blob(p.0.to_vec()))
.map(|digest| Value::Blob(digest.0.to_vec()))
.collect::<Vec<_>>(),
);
let rows = query.query_map(params![digests], |row| {
Ok((row.get::<_, SpanDigest>(0)?, row.get::<_, Embedding>(1)?))
})?;
for row in rows {
if let Ok(row) = row {
embeddings_by_digest.insert(row.0, row.1);
}
for (digest, embedding) in rows.flatten() {
embeddings_by_digest.insert(digest, embedding);
}
Ok(embeddings_by_digest)
@ -344,10 +338,8 @@ impl VectorDatabase {
Ok((row.get::<_, SpanDigest>(0)?, row.get::<_, Embedding>(1)?))
})?;
for row in rows {
if let Ok(row) = row {
embeddings_by_digest.insert(row.0, row.1);
}
for (digest, embedding) in rows.flatten() {
embeddings_by_digest.insert(digest, embedding);
}
}