gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-27 19:50:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix clippy lints in nightly

Browse Source
This commit is contained in:
josh@gitbutler.com 2023-12-11 11:09:27 +01:00 committed by GitButler
parent dc06dadb10
commit 333ded9534
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -88,3 +88,4 @@ inconsistent_struct_constructor = { level = "allow", priority = 1 }
match_wildcard_for_single_variants = { level = "allow", priority = 1 }
unnested_or_patterns = { level = "allow", priority = 1 }
similar_names = { level = "allow", priority = 1 }
struct_field_names = { level = "allow", priority = 1 }

6
packages/tauri/src/project_repository/conflicts.rs
View File

@ -55,7 +55,7 @@ pub fn resolve(repository: &Repository, path: &str) -> Result<()> {
let file = std::fs::File::open(conflicts_path.clone())?;
let reader = std::io::BufReader::new(file);
let mut remaining = Vec::new();
for line in reader.lines().flatten() {
for line in reader.lines().map_while(Result::ok) {
if line != path {
remaining.push(line);
}
@ -79,7 +79,7 @@ pub fn conflicting_files(repository: &Repository) -> Result<Option<Vec<String>>>
let file = std::fs::File::open(conflicts_path)?;
let reader = std::io::BufReader::new(file);
Ok(Some(reader.lines().flatten().collect()))
Ok(Some(reader.lines().map_while(Result::ok).collect()))
}
pub fn is_conflicting(repository: &Repository, path: Option<&str>) -> Result<bool> {
@ -90,7 +90,7 @@ pub fn is_conflicting(repository: &Repository, path: Option<&str>) -> Result<boo
let file = std::fs::File::open(conflicts_path)?;
let reader = std::io::BufReader::new(file);
let files = reader.lines().flatten().collect::<Vec<_>>();
let files = reader.lines().map_while(Result::ok).collect::<Vec<_>>();
if let Some(pathname) = path {
// check if pathname is one of the lines in conflicts_path file
for line in files {