From dfd4abe05f323343efb0299af4576395de48725c Mon Sep 17 00:00:00 2001 From: extrawurst Date: Thu, 25 May 2023 13:39:03 +0200 Subject: [PATCH] addresses PR review feedback --- src/repo.rs | 2 +- src/stash.rs | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/repo.rs b/src/repo.rs index 79ab0cbbcc..921e2b30e2 100644 --- a/src/repo.rs +++ b/src/repo.rs @@ -2844,7 +2844,7 @@ impl Repository { } } - /// + /// Like `stash_save` but with more options like selective statshing via path patterns. pub fn stash_save_ext( &mut self, opts: Option<&mut StashSaveOptions<'_>>, diff --git a/src/stash.rs b/src/stash.rs index 9466247cb9..bff9e49dee 100644 --- a/src/stash.rs +++ b/src/stash.rs @@ -39,7 +39,7 @@ impl<'a> StashSaveOptions<'a> { opts } - /// + /// Customize optional `flags` field pub fn flags(&mut self, flags: Option) -> &mut Self { self.flags = flags; self @@ -218,7 +218,6 @@ mod tests { use crate::test::repo_init; use crate::{IndexAddOption, Repository, StashFlags, Status}; use std::fs; - use std::io::Write; use std::path::{Path, PathBuf}; fn make_stash(next: C) @@ -230,10 +229,8 @@ mod tests { let p = Path::new(repo.workdir().unwrap()).join("file_b.txt"); println!("using path {:?}", p); - fs::File::create(&p) - .unwrap() - .write("data".as_bytes()) - .unwrap(); + + fs::write(&p, "data".as_bytes()).unwrap(); let rel_p = Path::new("file_b.txt"); assert!(repo.status_file(&rel_p).unwrap() == Status::WT_NEW); @@ -303,10 +300,7 @@ mod tests { let p = Path::new(repo.workdir().unwrap()).join("file_b.txt"); - fs::File::create(&p) - .unwrap() - .write("data".as_bytes()) - .unwrap(); + fs::write(&p, "data".as_bytes()).unwrap(); repo.stash_save2(&signature, None, Some(StashFlags::INCLUDE_UNTRACKED)) .unwrap(); @@ -324,10 +318,7 @@ mod tests { fn create_file(r: &Repository, name: &str, data: &str) -> PathBuf { let p = Path::new(r.workdir().unwrap()).join(name); - fs::File::create(&p) - .unwrap() - .write(data.as_bytes()) - .unwrap(); + fs::write(&p, data).unwrap(); p }