refactor: move core crate into subdirectory

AOSC-Dev · Jan 11, 2025 · cc9af4f · cc9af4f
1 parent 694e33c
commit cc9af4f
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 40 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
-    ".",
+    "ciel/",
     "cli/",
 ]
 
@@ -13,44 +13,6 @@ authors = ["liushuyu <[email protected]>", "xtex <[email protected]>"]
 repository = "https://github.com/AOSC-Dev/ciel-rs"
 edition = "2021"
 
-[package]
-name = "ciel"
-version.workspace = true
-description.workspace = true
-license.workspace = true
-authors.workspace = true
-repository.workspace = true
-edition.workspace = true
-
-[dependencies]
-zbus = { version = "^5", features = ["blocking"] }
-nix = { version = "0.29", features = ["fs", "hostname", "mount", "signal", "user"] }
-toml = "0.8"
-bincode = "1.3"
-serde = { version = "1.0", features = ["derive"] }
-git2 = "0.19"
-libmount = { git = "https://github.com/liushuyu/libmount", rev = "6fe8dba03a6404dfe1013995dd17af1c4e21c97b" }
-adler32 = "1.2"
-rayon = "1.10"
-tempfile = "3.14"
-libsystemd-sys = "0.9"
-walkdir = "2"
-xattr = "^1"
-rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
-time = { version = "0.3", default-features = false, features = ["serde-human-readable", "macros"] }
-fs3 = "0.5"
-ar = "0.9"
-faster-hex = "0.10"
-flate2 = "1.0"
-inotify = "0.11"
-zstd = "0.13.2"
-thiserror = "2.0.8"
-log = "0.4.22"
-test-log = { version = "0.2.16", features = ["log"] }
-sha2 = "0.10.8"
-tar = "0.4.43"
-xz2 = "0.1.7"
-
 [profile.release]
 lto = true
 

diff --git a/ciel/Cargo.toml b/ciel/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "ciel"
+version.workspace = true
+description.workspace = true
+license.workspace = true
+authors.workspace = true
+repository.workspace = true
+edition.workspace = true
+
+[dependencies]
+zbus = { version = "^5", features = ["blocking"] }
+nix = { version = "0.29", features = ["fs", "hostname", "mount", "signal", "user"] }
+toml = "0.8"
+bincode = "1.3"
+serde = { version = "1.0", features = ["derive"] }
+git2 = "0.19"
+libmount = { git = "https://github.com/liushuyu/libmount", rev = "6fe8dba03a6404dfe1013995dd17af1c4e21c97b" }
+adler32 = "1.2"
+rayon = "1.10"
+tempfile = "3.14"
+libsystemd-sys = "0.9"
+walkdir = "2"
+xattr = "^1"
+rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
+time = { version = "0.3", default-features = false, features = ["serde-human-readable", "macros"] }
+fs3 = "0.5"
+ar = "0.9"
+faster-hex = "0.10"
+flate2 = "1.0"
+inotify = "0.11"
+zstd = "0.13.2"
+thiserror = "2.0.8"
+log = "0.4.22"
+test-log = { version = "0.2.16", features = ["log"] }
+sha2 = "0.10.8"
+tar = "0.4.43"
+xz2 = "0.1.7"
diff --git a/src/build.rs → ciel/src/build.rs b/src/build.rs → ciel/src/build.rs
diff --git a/src/container.rs → ciel/src/container.rs b/src/container.rs → ciel/src/container.rs
diff --git a/src/dbus_machine1_machine.rs → ciel/src/dbus_machine1_machine.rs b/src/dbus_machine1_machine.rs → ciel/src/dbus_machine1_machine.rs
diff --git a/src/dbus_machine1_manager.rs → ciel/src/dbus_machine1_manager.rs b/src/dbus_machine1_manager.rs → ciel/src/dbus_machine1_manager.rs
diff --git a/src/fs/mod.rs → ciel/src/fs/mod.rs b/src/fs/mod.rs → ciel/src/fs/mod.rs
diff --git a/src/fs/overlayfs.rs → ciel/src/fs/overlayfs.rs b/src/fs/overlayfs.rs → ciel/src/fs/overlayfs.rs
diff --git a/src/fs/tmpfs.rs → ciel/src/fs/tmpfs.rs b/src/fs/tmpfs.rs → ciel/src/fs/tmpfs.rs
diff --git a/src/instance.rs → ciel/src/instance.rs b/src/instance.rs → ciel/src/instance.rs
diff --git a/src/lib.rs → ciel/src/lib.rs b/src/lib.rs → ciel/src/lib.rs
diff --git a/src/machine.rs → ciel/src/machine.rs b/src/machine.rs → ciel/src/machine.rs
diff --git a/src/repo/mod.rs → ciel/src/repo/mod.rs b/src/repo/mod.rs → ciel/src/repo/mod.rs
diff --git a/src/repo/monitor.rs → ciel/src/repo/monitor.rs b/src/repo/monitor.rs → ciel/src/repo/monitor.rs
diff --git a/src/repo/scan.rs → ciel/src/repo/scan.rs b/src/repo/scan.rs → ciel/src/repo/scan.rs
diff --git a/src/workspace.rs → ciel/src/workspace.rs b/src/workspace.rs → ciel/src/workspace.rs
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -9,7 +9,7 @@ edition.workspace = true
 
 [dependencies]
 anyhow = "1.0.94"
-ciel = { version = "4.0.0", path = ".." }
+ciel = { version = "4.0.0", path = "../ciel" }
 clap = { version = "^4", features = ["string", "env"] }
 console = "0.15.10"
 dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }