Skip to content

Commit 44a4503

Browse files
chore: cargo fmt
1 parent 4768e98 commit 44a4503

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

crates/git/src/blame.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ impl Blame {
3131
content: &Rope,
3232
remote_url: Option<String>,
3333
provider_registry: Arc<GitHostingProviderRegistry>,
34-
author_display_replace: Option<&str>
34+
author_display_replace: Option<&str>,
3535
) -> Result<Self> {
3636
let output = run_git_blame(git_binary, working_directory, path, content)?;
3737
let mut entries = parse_git_blame(&output)?;

crates/git/src/repository.rs

+18-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ pub trait GitRepository: Send + Sync {
4444
fn create_branch(&self, _: &str) -> Result<()>;
4545
fn branch_exits(&self, _: &str) -> Result<bool>;
4646

47-
fn blame(&self, path: &Path, content: Rope, author_display_replace: Option<&str>) -> Result<crate::blame::Blame>;
47+
fn blame(
48+
&self,
49+
path: &Path,
50+
content: Rope,
51+
author_display_replace: Option<&str>,
52+
) -> Result<crate::blame::Blame>;
4853

4954
fn path(&self) -> PathBuf;
5055
}
@@ -204,7 +209,12 @@ impl GitRepository for RealGitRepository {
204209
Ok(())
205210
}
206211

207-
fn blame(&self, path: &Path, content: Rope, author_display_replace: Option<&str>) -> Result<crate::blame::Blame> {
212+
fn blame(
213+
&self,
214+
path: &Path,
215+
content: Rope,
216+
author_display_replace: Option<&str>,
217+
) -> Result<crate::blame::Blame> {
208218
let working_directory = self
209219
.repository
210220
.lock()
@@ -350,7 +360,12 @@ impl GitRepository for FakeGitRepository {
350360
Ok(())
351361
}
352362

353-
fn blame(&self, path: &Path, _content: Rope, _author_replace_display: Option<&str>) -> Result<crate::blame::Blame> {
363+
fn blame(
364+
&self,
365+
path: &Path,
366+
_content: Rope,
367+
_author_replace_display: Option<&str>,
368+
) -> Result<crate::blame::Blame> {
354369
let state = self.state.lock();
355370
state
356371
.blames

crates/project/src/buffer_store.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::{
2+
project_settings::GitAuthorDisplaySetting,
23
search::SearchQuery,
3-
ProjectSettings, project_settings::GitAuthorDisplaySetting,
44
worktree_store::{WorktreeStore, WorktreeStoreEvent},
5-
Item, ProjectPath,
5+
Item, ProjectPath, ProjectSettings,
66
};
77
use ::git::{parse_git_remote_url, BuildPermalinkParams, GitHostingProviderRegistry};
88
use anyhow::{anyhow, Context as _, Result};

0 commit comments

Comments
 (0)