Enable clippy::needless_question_mark (#8759)

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

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-03-02 23:40:39 -05:00 committed by GitHub
parent 33790b81fc
commit a6dbaac653
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 23 additions and 26 deletions

View file

@ -179,14 +179,13 @@ async fn add_contributor(
Json(params): Json<AuthenticatedUserParams>, Json(params): Json<AuthenticatedUserParams>,
Extension(app): Extension<Arc<AppState>>, Extension(app): Extension<Arc<AppState>>,
) -> Result<()> { ) -> Result<()> {
Ok(app app.db
.db
.add_contributor( .add_contributor(
&params.github_login, &params.github_login,
params.github_user_id, params.github_user_id,
params.github_email.as_deref(), params.github_email.as_deref(),
) )
.await?) .await
} }
#[derive(Deserialize)] #[derive(Deserialize)]

View file

@ -1030,7 +1030,7 @@ impl Database {
if result.rows_affected != 1 { if result.rows_affected != 1 {
Err(anyhow!("could not update room participant role"))?; Err(anyhow!("could not update room participant role"))?;
} }
Ok(self.get_room(room_id, &tx).await?) self.get_room(room_id, &tx).await
}) })
.await .await
} }

View file

@ -43,7 +43,7 @@ async fn test_channels(db: &Arc<Database>) {
let mut members = db let mut members = db
.transaction(|tx| async move { .transaction(|tx| async move {
let channel = db.get_channel_internal(replace_id, &tx).await?; let channel = db.get_channel_internal(replace_id, &tx).await?;
Ok(db.get_channel_participants(&channel, &tx).await?) db.get_channel_participants(&channel, &tx).await
}) })
.await .await
.unwrap(); .unwrap();

View file

@ -952,14 +952,14 @@ impl Item for Editor {
let buffer = project_item let buffer = project_item
.downcast::<Buffer>() .downcast::<Buffer>()
.map_err(|_| anyhow!("Project item at stored path was not a buffer"))?; .map_err(|_| anyhow!("Project item at stored path was not a buffer"))?;
Ok(pane.update(&mut cx, |_, cx| { pane.update(&mut cx, |_, cx| {
cx.new_view(|cx| { cx.new_view(|cx| {
let mut editor = Editor::for_buffer(buffer, Some(project), cx); let mut editor = Editor::for_buffer(buffer, Some(project), cx);
editor.read_scroll_position_from_db(item_id, workspace_id, cx); editor.read_scroll_position_from_db(item_id, workspace_id, cx);
editor editor
}) })
})?) })
}) })
}) })
.unwrap_or_else(|error| Task::ready(Err(error))) .unwrap_or_else(|error| Task::ready(Err(error)))

View file

@ -5424,11 +5424,11 @@ impl Project {
return Err(err); return Err(err);
} }
return Ok(this.update(&mut cx, |this, _| { return this.update(&mut cx, |this, _| {
this.last_workspace_edits_by_language_server this.last_workspace_edits_by_language_server
.remove(&lang_server.server_id()) .remove(&lang_server.server_id())
.unwrap_or_default() .unwrap_or_default()
})?); });
} }
Ok(ProjectTransaction::default()) Ok(ProjectTransaction::default())
@ -7865,13 +7865,13 @@ impl Project {
this.update(&mut cx, |this, cx| this.save_buffer(buffer.clone(), cx))? this.update(&mut cx, |this, cx| this.save_buffer(buffer.clone(), cx))?
.await?; .await?;
Ok(buffer.update(&mut cx, |buffer, _| proto::BufferSaved { buffer.update(&mut cx, |buffer, _| proto::BufferSaved {
project_id, project_id,
buffer_id: buffer_id.into(), buffer_id: buffer_id.into(),
version: serialize_version(buffer.saved_version()), version: serialize_version(buffer.saved_version()),
mtime: Some(buffer.saved_mtime().into()), mtime: Some(buffer.saved_mtime().into()),
fingerprint: language::proto::serialize_fingerprint(buffer.saved_version_fingerprint()), fingerprint: language::proto::serialize_fingerprint(buffer.saved_version_fingerprint()),
})?) })
} }
async fn handle_reload_buffers( async fn handle_reload_buffers(
@ -8206,7 +8206,7 @@ impl Project {
.await .await
.context("inlay hints fetch")?; .context("inlay hints fetch")?;
Ok(this.update(&mut cx, |project, cx| { this.update(&mut cx, |project, cx| {
InlayHints::response_to_proto( InlayHints::response_to_proto(
buffer_hints, buffer_hints,
project, project,
@ -8214,7 +8214,7 @@ impl Project {
&buffer.read(cx).version(), &buffer.read(cx).version(),
cx, cx,
) )
})?) })
} }
async fn handle_resolve_inlay_hint( async fn handle_resolve_inlay_hint(

View file

@ -1028,7 +1028,7 @@ impl ProjectPanel {
cx.foreground_executor().spawn(task).detach_and_log_err(cx); cx.foreground_executor().spawn(task).detach_and_log_err(cx);
} }
Some(project.worktree_id_for_entry(destination, cx)?) project.worktree_id_for_entry(destination, cx)
}); });
if let Some(destination_worktree) = destination_worktree { if let Some(destination_worktree) = destination_worktree {

View file

@ -125,7 +125,7 @@ impl VectorDatabase {
// Delete existing tables, if SEMANTIC_INDEX_VERSION is bumped // Delete existing tables, if SEMANTIC_INDEX_VERSION is bumped
let version_query = db.prepare("SELECT version from semantic_index_config"); let version_query = db.prepare("SELECT version from semantic_index_config");
let version = version_query let version = version_query
.and_then(|mut query| query.query_row([], |row| Ok(row.get::<_, i64>(0)?))); .and_then(|mut query| query.query_row([], |row| row.get::<_, i64>(0)));
if version.map_or(false, |version| version == SEMANTIC_INDEX_VERSION as i64) { if version.map_or(false, |version| version == SEMANTIC_INDEX_VERSION as i64) {
log::trace!("vector database schema up to date"); log::trace!("vector database schema up to date");
return Ok(()); return Ok(());
@ -275,8 +275,8 @@ impl VectorDatabase {
self.transact(move |db| { self.transact(move |db| {
let mut worktree_query = let mut worktree_query =
db.prepare("SELECT id FROM worktrees WHERE absolute_path = ?1")?; db.prepare("SELECT id FROM worktrees WHERE absolute_path = ?1")?;
let worktree_id = worktree_query let worktree_id =
.query_row(params![worktree_root_path], |row| Ok(row.get::<_, i64>(0)?)); worktree_query.query_row(params![worktree_root_path], |row| row.get::<_, i64>(0));
Ok(worktree_id.is_ok()) Ok(worktree_id.is_ok())
}) })
@ -356,7 +356,7 @@ impl VectorDatabase {
db.prepare("SELECT id FROM worktrees WHERE absolute_path = ?1")?; db.prepare("SELECT id FROM worktrees WHERE absolute_path = ?1")?;
let worktree_id = worktree_query let worktree_id = worktree_query
.query_row(params![worktree_root_path.to_string_lossy()], |row| { .query_row(params![worktree_root_path.to_string_lossy()], |row| {
Ok(row.get::<_, i64>(0)?) row.get::<_, i64>(0)
}); });
if worktree_id.is_ok() { if worktree_id.is_ok() {

View file

@ -622,11 +622,11 @@ impl WorkspaceDb {
} }
fn get_items(&self, pane_id: PaneId) -> Result<Vec<SerializedItem>> { fn get_items(&self, pane_id: PaneId) -> Result<Vec<SerializedItem>> {
Ok(self.select_bound(sql!( self.select_bound(sql!(
SELECT kind, item_id, active FROM items SELECT kind, item_id, active FROM items
WHERE pane_id = ? WHERE pane_id = ?
ORDER BY position ORDER BY position
))?(pane_id)?) ))?(pane_id)
} }
fn save_items( fn save_items(

View file

@ -1243,11 +1243,10 @@ impl Workspace {
} }
} }
Ok(this this.update(&mut cx, |this, cx| {
.update(&mut cx, |this, cx| { this.save_all_internal(SaveIntent::Close, cx)
this.save_all_internal(SaveIntent::Close, cx) })?
})? .await
.await?)
}) })
} }

View file

@ -100,7 +100,6 @@ fn run_clippy(args: ClippyArgs) -> Result<()> {
"clippy::map_entry", "clippy::map_entry",
"clippy::needless_lifetimes", "clippy::needless_lifetimes",
"clippy::needless_option_as_deref", "clippy::needless_option_as_deref",
"clippy::needless_question_mark",
"clippy::needless_update", "clippy::needless_update",
"clippy::never_loop", "clippy::never_loop",
"clippy::non_canonical_clone_impl", "clippy::non_canonical_clone_impl",