Use Cargo workspaces instead of symlinks

conradkleinespel · Nov 26, 2022 · 5ea9c16 · 5ea9c16
1 parent 77da060
commit 5ea9c16
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 477 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,15 +12,11 @@ keywords = ["read", "password", "security", "pass", "getpass"]
 edition = "2018"
 rust-version = "1.60"
 
-[features]
-serde = ["dep:serde", "dep:serde_json"]
-
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["std", "winnt", "fileapi", "processenv", "winbase", "handleapi", "consoleapi", "minwindef", "wincon"] }
 
 [dependencies]
-serde = { version = "1.0", features = ["derive"], optional = true }
-serde_json = { version = "1.0", optional = true }
+rutil = { path = "../rutil" }
diff --git a/src/lib.rs b/src/lib.rs
@@ -30,7 +30,5 @@
 
 #[allow(unused)]
 mod rpassword;
-#[allow(unused)]
-mod rutil;
 
 pub use crate::rpassword::*;
diff --git a/src/rpassword/all.rs b/src/rpassword/all.rs
@@ -1,6 +1,6 @@
-use crate::rutil::fix_line_issues::fix_line_issues;
-use crate::rutil::print_tty::{print_tty, print_writer};
-use crate::rutil::safe_string::SafeString;
+use rutil::rutil::fix_line_issues::fix_line_issues;
+use rutil::rutil::print_tty::{print_tty, print_writer};
+use rutil::rutil::safe_string::SafeString;
 use std::io::{BufRead, Write};
 
 #[cfg(target_family = "wasm")]

diff --git a/src/rutil.rs b/src/rutil.rs
diff --git a/src/rutil/atty.rs b/src/rutil/atty.rs
diff --git a/src/rutil/fix_line_issues.rs b/src/rutil/fix_line_issues.rs
diff --git a/src/rutil/print_tty.rs b/src/rutil/print_tty.rs
diff --git a/src/rutil/safe_string.rs b/src/rutil/safe_string.rs