Stable rust patch

Signed-off-by: Alex Saveau <[email protected]>

Cargo.toml

@@ -18,6 +18,7 @@ authors = ["Alex Saveau <[email protected]>"]
 edition = "2021"
 repository = "https://github.com/SUPERCILEX/fuc"
 license = "Apache-2.0"
+rust-version = "1.70"
 
 [package]
 name = "lint"

cpz/Cargo.toml

@@ -8,11 +8,13 @@ repository.workspace = true
 keywords = ["tools", "files", "cp"]
 categories = ["command-line-utilities", "development-tools", "filesystem"]
 license.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 clap = { version = "4.4.6", features = ["derive", "wrap_help"] }
 error-stack = "0.4.1"
 fuc_engine = { version = "1", path = "../fuc_engine" }
+once_cell = "1.18.0"
 thiserror = "1.0.49"
 
 [dev-dependencies]

cpz/src/main.rs

@@ -1,8 +1,4 @@
-#![feature(lazy_cell)]
-#![feature(let_chains)]
-
 use std::{
-    cell::LazyCell,
     fs,
     mem::swap,
     path::{PathBuf, MAIN_SEPARATOR, MAIN_SEPARATOR_STR},
@@ -11,6 +7,7 @@ use std::{
 use clap::{ArgAction, Parser, ValueHint};
 use error_stack::Report;
 use fuc_engine::{CopyOp, Error};
+use once_cell::sync::Lazy as LazyCell;
 
 /// A zippy alternative to `cp`, a tool to copy files and directories
 #[derive(Parser, Debug)]
@@ -142,8 +139,10 @@ fn copy(
                 let to = {
                     let is_into_directory = *is_into_directory;
                     let mut to = to;
-                    if is_into_directory && let Some(name) = from.file_name() {
-                        to.push(name);
+                    if is_into_directory {
+                        if let Some(name) = from.file_name() {
+                            to.push(name);
+                        }
                     }
                     to
                 };

fuc_engine/Cargo.toml

@@ -8,9 +8,11 @@ repository.workspace = true
 keywords = ["tools", "files"]
 categories = ["filesystem"]
 license.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 crossbeam-channel = "0.5.8"
+once_cell = "1.18.0"
 thiserror = "1.0.49"
 typed-builder = "0.16.2"
 

fuc_engine/src/lib.rs

@@ -1,6 +1,3 @@
-#![feature(lazy_cell)]
-#![feature(lazy_cell_consume)]
-#![feature(c_str_literals)]
 #![allow(clippy::module_name_repetitions)]
 #![allow(clippy::used_underscore_binding)]
 #![allow(clippy::needless_pass_by_value)]

fuc_engine/src/ops/copy.rs

@@ -137,7 +137,7 @@ fn schedule_copies<
 mod compat {
     use std::{
         borrow::Cow,
-        cell::{Cell, LazyCell},
+        cell::Cell,
         ffi::{CStr, CString},
         fs::File,
         io,
@@ -150,6 +150,7 @@ mod compat {
     };
 
     use crossbeam_channel::{Receiver, Sender};
+    use once_cell::sync::Lazy as LazyCell;
     use rustix::{
         fs::{
             copy_file_range, mkdirat, openat, readlinkat, statx, symlinkat, AtFlags, FileType,
@@ -167,6 +168,8 @@ mod compat {
         Error,
     };
 
+    const EMPTY: &CStr = unsafe { CStr::from_bytes_with_nul_unchecked(b"\0") };
+
     struct Impl<LF: FnOnce() -> (Sender<TreeNode>, JoinHandle<Result<(), Error>>)> {
         #[allow(clippy::type_complexity)]
         scheduling: LazyCell<(Sender<TreeNode>, JoinHandle<Result<(), Error>>), LF>,
@@ -199,7 +202,7 @@ mod compat {
         fn finish(self) -> Result<(), Error> {
             let Self { scheduling } = self;
 
-            if let Ok((tasks, thread)) = LazyCell::into_inner(scheduling) {
+            if let Ok((tasks, thread)) = LazyCell::into_value(scheduling) {
                 drop(tasks);
                 thread.join().map_err(|_| Error::Join)??;
             }
@@ -288,8 +291,8 @@ mod compat {
                 continue;
             }
             {
-                let name = file.file_name();
-                if name == c"." || name == c".." {
+                let name = file.file_name().to_bytes();
+                if name == b"." || name == b".." {
                     continue;
                 }
             }
@@ -333,7 +336,7 @@ mod compat {
         to_path: &CString,
     ) -> Result<(), Error> {
         let from_mode = {
-            let from_metadata = statx(from_dir, c"", AtFlags::EMPTY_PATH, StatxFlags::MODE)
+            let from_metadata = statx(from_dir, EMPTY, AtFlags::EMPTY_PATH, StatxFlags::MODE)
                 .map_io_err(|| format!("Failed to stat directory: {from_path:?}"))?;
             Mode::from_raw_mode(from_metadata.stx_mode.into())
         };
@@ -497,7 +500,7 @@ mod compat {
         Ok(if let Some(ino) = root_to_inode {
             ino
         } else {
-            let to_metadata = statx(to_dir, c"", AtFlags::EMPTY_PATH, StatxFlags::INO)
+            let to_metadata = statx(to_dir, EMPTY, AtFlags::EMPTY_PATH, StatxFlags::INO)
                 .map_io_err(|| format!("Failed to stat directory: {to:?}"))?;
             to_metadata.stx_ino
         })

fuc_engine/src/ops/remove.rs

@@ -87,11 +87,12 @@ fn schedule_deletions<'a, I: Into<Cow<'a, Path>>, F: IntoIterator<Item = I>>(
 #[cfg(target_os = "linux")]
 mod compat {
     use std::{
-        borrow::Cow, cell::LazyCell, ffi::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};
+    use once_cell::sync::Lazy as LazyCell;
     use rustix::{
         fs::{openat, unlinkat, AtFlags, FileType, Mode, OFlags, RawDir, CWD},
         thread::{unshare, UnshareFlags},
@@ -138,7 +139,7 @@ mod compat {
         fn finish(self) -> Result<(), Error> {
             let Self { scheduling } = self;
 
-            if let Ok((tasks, thread)) = LazyCell::into_inner(scheduling) {
+            if let Ok((tasks, thread)) = LazyCell::into_value(scheduling) {
                 drop(tasks);
                 thread.join().map_err(|_| Error::Join)??;
             }
@@ -214,8 +215,8 @@ mod compat {
         while let Some(file) = raw_dir.next() {
             let file = file.map_io_err(|| format!("Failed to read directory: {:?}", node.path))?;
             {
-                let name = file.file_name();
-                if name == c"." || name == c".." {
+                let name = file.file_name().to_bytes();
+                if name == b"." || name == b".." {
                     continue;
                 }
             }

rmz/Cargo.toml

@@ -8,6 +8,7 @@ repository.workspace = true
 keywords = ["tools", "files", "rm"]
 categories = ["command-line-utilities", "development-tools", "filesystem"]
 license.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 clap = { version = "4.4.6", features = ["derive", "wrap_help"] }