Make clippy happy

This commit is contained in:
2022-12-12 14:46:08 +01:00
parent 5fc1d2148f
commit 6e79dd318a
4 changed files with 7 additions and 7 deletions

View File

@@ -298,7 +298,7 @@ pub fn read_config<'a, T>(path: &str) -> Result<T, String>
where
T: for<'de> serde::Deserialize<'de>,
{
let content = match std::fs::read_to_string(&path) {
let content = match std::fs::read_to_string(path) {
Ok(s) => s,
Err(e) => {
return Err(format!(

View File

@@ -106,7 +106,7 @@ fn find_repos(root: &Path) -> Result<Option<(Vec<repo::Repo>, Vec<String>, bool)
},
)
} else {
let name = path.strip_prefix(&root).unwrap();
let name = path.strip_prefix(root).unwrap();
let namespace = name.parent().unwrap();
(
if namespace != Path::new("") {

View File

@@ -785,7 +785,7 @@ impl RepoHandle {
))
})?;
for entry in match std::fs::read_dir(&root_dir) {
for entry in match std::fs::read_dir(root_dir) {
Ok(iterator) => iterator,
Err(error) => {
return Err(WorktreeConversionFailureReason::Error(format!(
@@ -1343,7 +1343,7 @@ impl RepoHandle {
},
})
{
let repo_dir = &directory.join(&worktree.name());
let repo_dir = &directory.join(worktree.name());
if repo_dir.exists() {
match self.remove_worktree(
directory,
@@ -1387,12 +1387,12 @@ impl RepoHandle {
.map_err(|error| format!("Getting worktrees failed: {}", error))?;
let mut unmanaged_worktrees = Vec::new();
for entry in std::fs::read_dir(&directory).map_err(|error| error.to_string())? {
for entry in std::fs::read_dir(directory).map_err(|error| error.to_string())? {
let dirname = path::path_as_string(
entry
.map_err(|error| error.to_string())?
.path()
.strip_prefix(&directory)
.strip_prefix(directory)
// that unwrap() is safe as each entry is
// guaranteed to be a subentry of &directory
.unwrap(),

View File

@@ -111,7 +111,7 @@ pub fn get_worktree_status_table(
add_worktree_table_header(&mut table);
for worktree in &worktrees {
let worktree_dir = &directory.join(&worktree.name());
let worktree_dir = &directory.join(worktree.name());
if worktree_dir.exists() {
let repo = match repo::RepoHandle::open(worktree_dir, false) {
Ok(repo) => repo,