Drop some nightly features (#15)

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
SUPERCILEX · Mar 26, 2023 · bbbfe20 · bbbfe20
1 parent dd77f17
commit bbbfe20
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/fuc_engine/src/lib.rs b/fuc_engine/src/lib.rs
@@ -1,6 +1,3 @@
-#![feature(const_cstr_methods)]
-#![feature(const_result_drop)]
-#![feature(const_option)]
 #![feature(once_cell)]
 #![allow(clippy::module_name_repetitions)]
 

diff --git a/fuc_engine/src/ops/copy.rs b/fuc_engine/src/ops/copy.rs
@@ -233,17 +233,18 @@ mod compat {
 
         let mut raw_dir = RawDir::new(&from_dir, buf);
         while let Some(file) = raw_dir.next() {
-            const DOT: &CStr = CStr::from_bytes_with_nul(b".\0").ok().unwrap();
-            const DOT_DOT: &CStr = CStr::from_bytes_with_nul(b"..\0").ok().unwrap();
-
             let file = file.map_io_err(|| format!("Failed to read directory: {from:?}"))?;
-            if file.file_name() == DOT || file.file_name() == DOT_DOT {
-                continue;
-            }
             if file.ino() == root_to_inode {
                 // Block recursive descent from parent into child (e.g. cp parent parent/child).
                 continue;
             }
+            {
+                // TODO here and other uses: https://github.com/rust-lang/rust/issues/105723
+                let name = file.file_name().to_bytes();
+                if name == b"." || name == b".." {
+                    continue;
+                }
+            }
 
             let file_type = match file.file_type() {
                 FileType::Unknown => get_file_type(&from_dir, file.file_name(), from)?,
@@ -277,7 +278,8 @@ mod compat {
         from_dir: impl AsFd,
         TreeNode { from, to, .. }: &TreeNode,
     ) -> Result<OwnedFd, Error> {
-        const EMPTY: &CStr = CStr::from_bytes_with_nul(b"\0").ok().unwrap();
+        // TODO here and other uses: https://github.com/rust-lang/rust/issues/105723
+        const EMPTY: &CStr = unsafe { CStr::from_bytes_with_nul_unchecked(b"\0") };
 
         let from_mode = {
             let from_metadata = statx(from_dir, EMPTY, AtFlags::EMPTY_PATH, StatxFlags::MODE)
@@ -451,7 +453,8 @@ mod compat {
         Ok(if let Some(ino) = *root_to_inode {
             ino
         } else {
-            const EMPTY: &CStr = CStr::from_bytes_with_nul(b"\0").ok().unwrap();
+            // TODO here and other uses: https://github.com/rust-lang/rust/issues/105723
+            const EMPTY: &CStr = unsafe { CStr::from_bytes_with_nul_unchecked(b"\0") };
 
             let to_metadata = statx(to_dir, EMPTY, AtFlags::EMPTY_PATH, StatxFlags::INO)
                 .map_io_err(|| format!("Failed to stat directory: {to:?}"))?;

diff --git a/fuc_engine/src/ops/remove.rs b/fuc_engine/src/ops/remove.rs
@@ -83,14 +83,8 @@ fn schedule_deletions<'a>(
 #[cfg(target_os = "linux")]
 mod compat {
     use std::{
-        borrow::Cow,
-        ffi::{CStr, CString},
-        mem::MaybeUninit,
-        num::NonZeroUsize,
-        path::Path,
-        sync::Arc,
-        thread,
-        thread::JoinHandle,
+        borrow::Cow, ffi::CString, mem::MaybeUninit, num::NonZeroUsize, path::Path, sync::Arc,
+        thread, thread::JoinHandle,
     };
 
     use crossbeam_channel::{Receiver, Sender};
@@ -215,13 +209,13 @@ mod compat {
         let node = LazyCell::new(|| Arc::new(node));
         let mut raw_dir = RawDir::new(&dir, buf);
         while let Some(file) = raw_dir.next() {
-            // TODO here and other uses: https://github.com/rust-lang/rust/issues/105723
-            const DOT: &CStr = CStr::from_bytes_with_nul(b".\0").ok().unwrap();
-            const DOT_DOT: &CStr = CStr::from_bytes_with_nul(b"..\0").ok().unwrap();
-
             let file = file.map_io_err(|| format!("Failed to read directory: {:?}", node.path))?;
-            if file.file_name() == DOT || file.file_name() == DOT_DOT {
-                continue;
+            {
+                // TODO here and other uses: https://github.com/rust-lang/rust/issues/105723
+                let name = file.file_name().to_bytes();
+                if name == b"." || name == b".." {
+                    continue;
+                }
             }
 
             let file_type = match file.file_type() {