From: Thierry Marianne Date: Sun, 21 Sep 2025 14:51:18 +0000 (+0200) Subject: run rustfmt X-Git-Tag: v0.10.0~1^2 X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=042631cb4c014d44c335a8559b2270ea45a9c69e;p=scryer-prolog.git run rustfmt Signed-off-by: Thierry Marianne --- diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs index 70aa63dc..5fc4088b 100644 --- a/src/machine/system_calls.rs +++ b/src/machine/system_calls.rs @@ -1986,10 +1986,7 @@ impl Machine { #[inline(always)] pub(crate) fn directory_files(&mut self) -> CallResult { - if let Some(dir) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { + if let Some(dir) = self.machine_st.value_to_str_like(self.deref_register(1)) { let str = dir.as_str(); let path = std::path::Path::new(&*str); let mut files = Vec::new(); @@ -2039,10 +2036,7 @@ impl Machine { #[inline(always)] pub(crate) fn file_size(&mut self) { - if let Some(file) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { + if let Some(file) = self.machine_st.value_to_str_like(self.deref_register(1)) { let len = Number::arena_from( fs::metadata(&*file.as_str()).unwrap().len(), &mut self.machine_st.arena, @@ -2064,10 +2058,7 @@ impl Machine { #[inline(always)] pub(crate) fn file_exists(&mut self) { - if let Some(file) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { + if let Some(file) = self.machine_st.value_to_str_like(self.deref_register(1)) { let file_str = file.as_str(); if !std::path::Path::new(&*file_str).exists() @@ -2082,10 +2073,7 @@ impl Machine { #[inline(always)] pub(crate) fn directory_exists(&mut self) { - if let Some(dir) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { + if let Some(dir) = self.machine_st.value_to_str_like(self.deref_register(1)) { let dir_str = dir.as_str(); if !std::path::Path::new(&*dir_str).exists() @@ -2100,10 +2088,7 @@ impl Machine { #[inline(always)] pub(crate) fn file_time(&mut self) { - if let Some(file) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { + if let Some(file) = self.machine_st.value_to_str_like(self.deref_register(1)) { let which = cell_as_atom!(self.deref_register(2)); if let Ok(md) = fs::metadata(&*file.as_str()) { @@ -2139,10 +2124,7 @@ impl Machine { #[inline(always)] pub(crate) fn make_directory(&mut self) { - if let Some(dir) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { + if let Some(dir) = self.machine_st.value_to_str_like(self.deref_register(1)) { match fs::create_dir(&*dir.as_str()) { Ok(_) => {} _ => { @@ -2156,10 +2138,7 @@ impl Machine { #[inline(always)] pub(crate) fn make_directory_path(&mut self) { - if let Some(dir) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { + if let Some(dir) = self.machine_st.value_to_str_like(self.deref_register(1)) { match fs::create_dir_all(&*dir.as_str()) { Ok(_) => {} _ => { @@ -2173,10 +2152,7 @@ impl Machine { #[inline(always)] pub(crate) fn delete_file(&mut self) { - if let Some(file) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { + if let Some(file) = self.machine_st.value_to_str_like(self.deref_register(1)) { match fs::remove_file(&*file.as_str()) { Ok(_) => {} _ => { @@ -2188,14 +2164,8 @@ impl Machine { #[inline(always)] pub(crate) fn rename_file(&mut self) { - if let Some(file) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { - if let Some(renamed) = self - .machine_st - .value_to_str_like(self.deref_register(2)) - { + if let Some(file) = self.machine_st.value_to_str_like(self.deref_register(1)) { + if let Some(renamed) = self.machine_st.value_to_str_like(self.deref_register(2)) { if fs::rename(&*file.as_str(), &*renamed.as_str()).is_ok() { return; } @@ -2207,14 +2177,8 @@ impl Machine { #[inline(always)] pub(crate) fn file_copy(&mut self) { - if let Some(file) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { - if let Some(copied) = self - .machine_st - .value_to_str_like(self.deref_register(2)) - { + if let Some(file) = self.machine_st.value_to_str_like(self.deref_register(1)) { + if let Some(copied) = self.machine_st.value_to_str_like(self.deref_register(2)) { if fs::copy(&*file.as_str(), &*copied.as_str()).is_ok() { return; } @@ -2226,10 +2190,7 @@ impl Machine { #[inline(always)] pub(crate) fn delete_directory(&mut self) { - if let Some(dir) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { + if let Some(dir) = self.machine_st.value_to_str_like(self.deref_register(1)) { match fs::remove_dir(&*dir.as_str()) { Ok(_) => {} _ => { @@ -2283,10 +2244,7 @@ impl Machine { #[inline(always)] pub(crate) fn path_canonical(&mut self) -> CallResult { - if let Some(path) = self - .machine_st - .value_to_str_like(self.deref_register(1)) - { + if let Some(path) = self.machine_st.value_to_str_like(self.deref_register(1)) { if let Ok(canonical) = fs::canonicalize(&*path.as_str()) { let cs = match canonical.to_str() { Some(s) => s, diff --git a/tests/scryer/issues.rs b/tests/scryer/issues.rs index a0c01554..cb321746 100644 --- a/tests/scryer/issues.rs +++ b/tests/scryer/issues.rs @@ -119,7 +119,10 @@ fn issue_make_directory() { #[test] #[cfg_attr(miri, ignore = "it takes too long to run")] fn issue_make_directory_path() { - load_module_test("tests-pl/issue_make_directory_path.pl", "directory_path_made"); + load_module_test( + "tests-pl/issue_make_directory_path.pl", + "directory_path_made", + ); } #[serial]