changes wording from 'folder' to 'directory'

This commit is contained in:
Celso Bonutti 2022-02-24 18:10:39 -03:00
parent 9d487a4a95
commit 214d4e025b
No known key found for this signature in database
GPG key ID: A18A81C4314E1D48
3 changed files with 7 additions and 7 deletions

View file

@ -25,19 +25,19 @@ use roc_parse::{
}; };
use roc_region::all::{Loc, Region}; use roc_region::all::{Loc, Region};
fn flatten_folders(files: std::vec::Vec<PathBuf>) -> std::vec::Vec<PathBuf> { fn flatten_directories(files: std::vec::Vec<PathBuf>) -> std::vec::Vec<PathBuf> {
files files
.into_iter() .into_iter()
.flat_map(|file| { .flat_map(|file| {
if file.is_dir() { if file.is_dir() {
match file.read_dir() { match file.read_dir() {
Ok(folder) => folder Ok(directory) => directory
.flat_map(|result| match result { .flat_map(|result| match result {
Ok(file) => { Ok(file) => {
let path = file.path(); let path = file.path();
if path.is_dir() { if path.is_dir() {
flatten_folders(vec![path]) flatten_directories(vec![path])
} else if path.ends_with(".roc") { } else if path.ends_with(".roc") {
vec![path] vec![path]
} else { } else {
@ -45,14 +45,14 @@ fn flatten_folders(files: std::vec::Vec<PathBuf>) -> std::vec::Vec<PathBuf> {
} }
} }
Err(error) => internal_error!( Err(error) => internal_error!(
"There was an error while trying to read a file from a folder: {:?}", "There was an error while trying to read a file from a directory: {:?}",
error error
), ),
}) })
.collect(), .collect(),
Err(error) => { Err(error) => {
internal_error!( internal_error!(
"There was an error while trying to read the contents of a folder: {:?}", "There was an error while trying to read the contents of a directory: {:?}",
error error
); );
} }
@ -65,7 +65,7 @@ fn flatten_folders(files: std::vec::Vec<PathBuf>) -> std::vec::Vec<PathBuf> {
} }
pub fn format(files: std::vec::Vec<PathBuf>, mode: FormatMode) -> Result<(), String> { pub fn format(files: std::vec::Vec<PathBuf>, mode: FormatMode) -> Result<(), String> {
let files = flatten_folders(files); let files = flatten_directories(files);
for file in files { for file in files {
let arena = Bump::new(); let arena = Bump::new();

View file

@ -888,7 +888,7 @@ mod cli_run {
#[test] #[test]
fn format_check_folders() { fn format_check_folders() {
check_format_check_as_expected(&fixtures_dir("format"), false); check_format_check_as_expected(&fixtures_dir("format"), false);
check_format_check_as_expected(&fixtures_dir("format/formatted_folder"), true); check_format_check_as_expected(&fixtures_dir("format/formatted_directory"), true);
} }
} }