Generalize the use of camino instead of std::path

cpcsdk · Aug 3, 2024 · ead6904 · ead6904
1 parent be6ad2f
commit ead6904
Show file tree

Hide file tree

Showing 67 changed files with 276 additions and 296 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -84,6 +84,7 @@ bitflags = "2.6.0"
 bitvec = "1.0.1"
 built = { version = "0.7.4", features = ["chrono"] }
 camino = "1.1.7"
+camino-tempfile = "1.1.1"
 cc = "1.1.7"
 cfg-if = "1.0.0"
 chardetng = { version = "0.1.17", features = ["multithreading"] }
@@ -155,7 +156,6 @@ strsim = "0.11.1"
 subprocess = { version = "0.2.9" }
 substring = "1.4.5"
 syn = "2.0.72"
-tempfile = "3.10.1"
 term_grid = { version = "0.2.0" }
 termize = { version = "0.1.1" }
 test-generator = "0.3.1"

diff --git a/cpclib-asm/Cargo.toml b/cpclib-asm/Cargo.toml
@@ -24,7 +24,7 @@ cpclib-image.workspace = true
 
 arrayref.workspace = true
 assert_matches.workspace = true
-camino.workspace = true
+camino-tempfile.workspace = true
 cfg-if.workspace = true
 choice_nocase.workspace = true
 codespan-reporting.workspace = true
@@ -47,7 +47,6 @@ rust-embed = { workspace = true, features = ["compression", "debug-embed"] }
 serde = { workspace = true, features = ["derive"] }
 smartstring.workspace = true
 substring.workspace = true
-tempfile.workspace = true
 velcro.workspace = true
 
 rayon-cond = {version="0.3.0", optional= true}

diff --git a/cpclib-asm/src/assembler/file.rs b/cpclib-asm/src/assembler/file.rs
@@ -2,7 +2,7 @@ use std::collections::VecDeque;
 use std::fs::File;
 use std::io::Read;
 
-use camino::{Utf8Path, Utf8PathBuf};
+use cpclib_common::camino::{Utf8Path, Utf8PathBuf};
 use cpclib_disc::amsdos::AmsdosHeader;
 use either::Either;
 

diff --git a/cpclib-asm/src/assembler/mod.rs b/cpclib-asm/src/assembler/mod.rs
@@ -27,9 +27,9 @@ use std::ops::{Deref, Neg};
 use std::sync::{Arc, RwLock};
 use std::time::Instant;
 
-use camino::{Utf8Path, Utf8PathBuf};
 use cpclib_basic::*;
 use cpclib_common::bitvec::prelude::BitVec;
+use cpclib_common::camino::{Utf8Path, Utf8PathBuf};
 use cpclib_common::itertools::Itertools;
 use cpclib_common::smallvec::SmallVec;
 use cpclib_common::smol_str::SmolStr;
@@ -1746,11 +1746,11 @@ impl Env {
         self.sna_version
     }
 
-    pub fn save_sna<P: AsRef<std::path::Path>>(&self, fname: P) -> Result<(), std::io::Error> {
+    pub fn save_sna<P: AsRef<Utf8Path>>(&self, fname: P) -> Result<(), std::io::Error> {
         self.sna().save(fname, self.sna_version())
     }
 
-    pub fn save_cpr<P: AsRef<std::path::Path>>(&self, fname: P) -> Result<(), AssemblerError> {
+    pub fn save_cpr<P: AsRef<Utf8Path>>(&self, fname: P) -> Result<(), AssemblerError> {
         let cpr_asm = self.cpr.as_ref().unwrap();
         let cpr = cpr_asm.build_cpr()?;
         cpr.save(fname)

diff --git a/cpclib-asm/src/assembler/processed_token.rs b/cpclib-asm/src/assembler/processed_token.rs
@@ -4,7 +4,7 @@ use std::fmt::{Debug, Formatter};
 use std::ops::Deref;
 use std::sync::Arc;
 
-use camino::Utf8PathBuf;
+use cpclib_common::camino::Utf8PathBuf;
 use cpclib_common::itertools::Itertools;
 #[cfg(all(not(target_arch = "wasm32"), feature = "rayon"))]
 use cpclib_common::rayon::prelude::*;

diff --git a/cpclib-asm/src/assembler/report.rs b/cpclib-asm/src/assembler/report.rs
@@ -1,7 +1,7 @@
 use std::fmt::Display;
 use std::time::Instant;
 
-use camino::Utf8PathBuf;
+use cpclib_common::camino::Utf8PathBuf;
 use cpclib_common::itertools::Itertools;
 
 use super::Env;

diff --git a/cpclib-asm/src/assembler/save_command.rs b/cpclib-asm/src/assembler/save_command.rs
@@ -1,6 +1,6 @@
 use std::convert::TryFrom;
 
-use camino::Utf8PathBuf;
+use cpclib_common::camino::Utf8PathBuf;
 use cpclib_disc::amsdos::{AmsdosFile, AmsdosFileName};
 use cpclib_disc::disc::Disc;
 use cpclib_disc::edsk::Head;

diff --git a/cpclib-asm/src/implementation/listing.rs b/cpclib-asm/src/implementation/listing.rs
@@ -2,7 +2,7 @@ use std::borrow::Borrow;
 use std::collections::HashMap;
 use std::fmt;
 
-use camino::Utf8Path;
+use cpclib_common::camino::Utf8Path;
 use cpclib_tokens::tokens::*;
 
 use crate::error::*;

diff --git a/cpclib-asm/src/lib.rs b/cpclib-asm/src/lib.rs
@@ -13,6 +13,7 @@
 #![feature(slice_take)]
 #![feature(write_all_vectored)]
 
+// mod rewrite;
 /// Implementation of various behavior for the tokens of cpclib_tokens
 pub mod implementation;
 

diff --git a/cpclib-asm/src/parser/context.rs b/cpclib-asm/src/parser/context.rs
@@ -1,10 +1,10 @@
 use std::borrow::{Borrow, Cow};
 use std::collections::HashSet;
 use std::ops::Deref;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::{LazyLock, RwLock};
 
-use camino::{Utf8Path, Utf8PathBuf};
+use cpclib_common::camino::{Utf8Path, Utf8PathBuf};
 use cpclib_common::winnow::BStr;
 use either::Either;
 use regex::Regex;
@@ -356,12 +356,11 @@ impl ParserOptions {
                     return Ok(current_path);
                 }
                 else {
-                    let glob =
-                        GlobBuilder::new(current_path.as_path().as_str())
-                            .case_insensitive(true)
-                            .literal_separator(true)
-                            .build()
-                            .unwrap();
+                    let glob = GlobBuilder::new(current_path.as_path().as_str())
+                        .case_insensitive(true)
+                        .literal_separator(true)
+                        .build()
+                        .unwrap();
                     let matcher = glob.compile_matcher();
 
                     for entry in std::fs::read_dir(search).unwrap() {
@@ -487,7 +486,11 @@ impl ParserContext {
     #[inline]
     pub fn set_current_filename<P: Into<Utf8PathBuf>>(&mut self, file: P) {
         let file = file.into();
-        self.current_filename = Some(file.canonicalize().map(|p| Utf8PathBuf::from_path_buf(p).unwrap()).unwrap_or(file))
+        self.current_filename = Some(
+            file.canonicalize()
+                .map(|p| Utf8PathBuf::from_path_buf(p).unwrap())
+                .unwrap_or(file)
+        )
     }
 
     #[inline]

diff --git a/cpclib-asm/src/progress.rs b/cpclib-asm/src/progress.rs
@@ -1,7 +1,7 @@
 use core::time::Duration;
 use std::sync::{Arc, LazyLock, Mutex, MutexGuard};
 
-use camino::Utf8Path;
+use cpclib_common::camino::Utf8Path;
 use cpclib_common::itertools::Itertools;
 #[cfg(feature = "indicatif")]
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};

diff --git a/cpclib-basic/build.rs b/cpclib-basic/build.rs
@@ -1,6 +1,3 @@
-use std::env;
-use std::path::Path;
-
 fn main() {
     built::write_built_file().expect("Failed to acquire build-time information");
 }
diff --git a/cpclib-basic/src/bin/locomotive.rs b/cpclib-basic/src/bin/locomotive.rs
@@ -14,7 +14,6 @@
 
 use std::fs::File;
 use std::io::{Read, Write};
-use std::path::PathBuf;
 
 use cpclib_basic::{binary_parser, BasicProgram};
 use cpclib_common::clap;
@@ -32,7 +31,7 @@ fn main() -> std::io::Result<()> {
                 .short('b')
                 .help("Amstrad basic file")
                 .action(ArgAction::Set)
-                .value_parser(clap::value_parser!(PathBuf))
+                .value_parser(cpclib_common::utf8pathbuf_value_parser(true))
                 .required_unless_present("BASIC_SOURCE")
         )
         .arg(

diff --git a/cpclib-basm/Cargo.toml b/cpclib-basm/Cargo.toml
@@ -20,15 +20,14 @@ cpclib-xfer = {workspace=true, default-features=false, optional=true}
 cpclib-disc.workspace = true
 
 
-camino.workspace = true
 const_format.workspace = true
 diff = "0.1.13"
 parking_lot.workspace = true
 time.workspace = true
 
 [dev-dependencies]
 test-generator.workspace = true
-tempfile.workspace = true
+camino-tempfile.workspace = true
 pretty_assertions.workspace = true
 criterion.workspace = true
 globset.workspace = true