From ef5230f8630fbd8443532afd7ac5dd4beed41444 Mon Sep 17 00:00:00 2001 From: jdx <216188+jdx@users.noreply.github.com> Date: Fri, 15 Nov 2024 18:17:30 -0600 Subject: [PATCH 1/2] fix: sort files returned by ls --- src/file.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/file.rs b/src/file.rs index c3f0cff74ad..904af5c9869 100644 --- a/src/file.rs +++ b/src/file.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use std::collections::{BTreeSet, HashMap}; use std::fmt::Display; use std::fs; use std::fs::File; @@ -257,8 +257,8 @@ pub fn dir_subdirs(dir: &Path) -> Result> { Ok(output) } -pub fn ls(dir: &Path) -> Result> { - let mut output = vec![]; +pub fn ls(dir: &Path) -> Result> { + let mut output = Default::default(); if !dir.is_dir() { return Ok(output); @@ -266,15 +266,15 @@ pub fn ls(dir: &Path) -> Result> { for entry in dir.read_dir()? { let entry = entry?; - output.push(entry.path()); + output.insert(entry.path()); } Ok(output) } -pub fn recursive_ls(dir: &Path) -> Result> { +pub fn recursive_ls(dir: &Path) -> Result> { if !dir.is_dir() { - return Ok(vec![]); + return Ok(Default::default()) } Ok(WalkDir::new(dir) From a2e332c7311e49b64adc1aa5bf0042b93bbdcec4 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 00:21:30 +0000 Subject: [PATCH 2/2] [autofix.ci] apply automated fixes --- src/file.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file.rs b/src/file.rs index 904af5c9869..a201af3ae3a 100644 --- a/src/file.rs +++ b/src/file.rs @@ -274,7 +274,7 @@ pub fn ls(dir: &Path) -> Result> { pub fn recursive_ls(dir: &Path) -> Result> { if !dir.is_dir() { - return Ok(Default::default()) + return Ok(Default::default()); } Ok(WalkDir::new(dir)