Skip to content

Commit

Permalink
chore: 删除完成的 TODO 注释
Browse files Browse the repository at this point in the history
  • Loading branch information
someoneonsmile committed Aug 13, 2023
1 parent 5b26722 commit 3eac363
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ where
futures::stream::iter(packs.into_iter().map(Ok))
.try_filter_map(|pack| async {
let pack_config = Config::from_path(pack.as_ref().join(CONFIG_FILE_NAME))?;
// TODO: maybe the pack_config can be optional
if pack_config.is_none() {
error!(
"{:?} is not the pack_home (which contains {} config file)",
Expand Down
3 changes: 1 addition & 2 deletions src/merge_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,11 @@ impl MergeTree {
install_paths = install_paths.merge(sub_result.to_create_symlinks);
foldable &= sub_result.foldable;
}
// is there has other tree file?
foldable &= !util::has_new_sub(&self.target, &self.source)?;

// fold dir
if let Some(true) = self.option.as_ref().and_then(|it| it.fold) {
// TODO: is there has other tree file?
// if !has_ignore && util::is_empty_dir(&self.target) {
if foldable {
return Ok(MergeResult {
conflicts: None,
Expand Down

0 comments on commit 3eac363

Please sign in to comment.