Make clippy happy
This commit is contained in:
@@ -298,7 +298,7 @@ pub fn read_config<'a, T>(path: &str) -> Result<T, String>
|
|||||||
where
|
where
|
||||||
T: for<'de> serde::Deserialize<'de>,
|
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,
|
Ok(s) => s,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
return Err(format!(
|
return Err(format!(
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ fn find_repos(root: &Path) -> Result<Option<(Vec<repo::Repo>, Vec<String>, bool)
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
let name = path.strip_prefix(&root).unwrap();
|
let name = path.strip_prefix(root).unwrap();
|
||||||
let namespace = name.parent().unwrap();
|
let namespace = name.parent().unwrap();
|
||||||
(
|
(
|
||||||
if namespace != Path::new("") {
|
if namespace != Path::new("") {
|
||||||
|
|||||||
@@ -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,
|
Ok(iterator) => iterator,
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
return Err(WorktreeConversionFailureReason::Error(format!(
|
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() {
|
if repo_dir.exists() {
|
||||||
match self.remove_worktree(
|
match self.remove_worktree(
|
||||||
directory,
|
directory,
|
||||||
@@ -1387,12 +1387,12 @@ impl RepoHandle {
|
|||||||
.map_err(|error| format!("Getting worktrees failed: {}", error))?;
|
.map_err(|error| format!("Getting worktrees failed: {}", error))?;
|
||||||
|
|
||||||
let mut unmanaged_worktrees = Vec::new();
|
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(
|
let dirname = path::path_as_string(
|
||||||
entry
|
entry
|
||||||
.map_err(|error| error.to_string())?
|
.map_err(|error| error.to_string())?
|
||||||
.path()
|
.path()
|
||||||
.strip_prefix(&directory)
|
.strip_prefix(directory)
|
||||||
// that unwrap() is safe as each entry is
|
// that unwrap() is safe as each entry is
|
||||||
// guaranteed to be a subentry of &directory
|
// guaranteed to be a subentry of &directory
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ pub fn get_worktree_status_table(
|
|||||||
|
|
||||||
add_worktree_table_header(&mut table);
|
add_worktree_table_header(&mut table);
|
||||||
for worktree in &worktrees {
|
for worktree in &worktrees {
|
||||||
let worktree_dir = &directory.join(&worktree.name());
|
let worktree_dir = &directory.join(worktree.name());
|
||||||
if worktree_dir.exists() {
|
if worktree_dir.exists() {
|
||||||
let repo = match repo::RepoHandle::open(worktree_dir, false) {
|
let repo = match repo::RepoHandle::open(worktree_dir, false) {
|
||||||
Ok(repo) => repo,
|
Ok(repo) => repo,
|
||||||
|
|||||||
Reference in New Issue
Block a user