refactor: introduce cargo-workspace

boustrophedon · Oct 14, 2024 · 2880467 · 2880467
1 parent b56d18c
commit 2880467
Show file tree

Hide file tree

Showing 45 changed files with 79 additions and 26 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,40 +1,44 @@
-[package]
-name = "extrasafe"
+[workspace]
+members = [
+  "extrasafe"
+]
+resolver = "2"
+
+[workspace.package]
 version = "0.5.1"
+authors = [
+  "Harry Stern <[email protected]>",
+]
 edition = "2021"
-authors = ["Harry Stern <[email protected]>",]
-description = "Make your code extrasafe by reducing what it can access."
+rust-version = "1.74.0"
 repository = "https://github.com/boustrophedon/extrasafe"
 license = "MIT"
-keywords = ["security", "seccomp", "landlock", "syscall"]
-categories = ["os::linux-apis"]
-
-[package.metadata.docs.rs]
-all-features = true
-
-[features]
-landlock = ["dep:landlock"]
-isolate = []
-
-[dependencies]
-seccompiler = { version = "^0.4", default-features = false }
-libc = "^0.2"
-syscalls = { version = "^0.6", default-features = false }
-landlock = { version ="^0.3", optional = true }
+categories = [ "os::linux-apis" ]
 
-[dev-dependencies]
+[workspace.dependencies]
 bytes = "^1"
 crossbeam = "^0.8"
 crossbeam-queue = "^0.3"
 crossbeam-channel = "^0.5"
+landlock = "^0.3"
+libc = "^0.2"
+rusqlite = "^0.26"
 tempfile = "^3"
 tokio = "^1.15"
-hyper = { version = "^0.14", features = ["http1", "server", "runtime", "tcp"] }
 warp = "^0.3"
-rusqlite = "^0.26"
 
-[target.'cfg(target_env = "musl")'.dev-dependencies]
-reqwest = { version = "^0.11", default-features = false, features = ["rustls-tls"] }
+[workspace.dependencies.hyper]
+version = "^0.14"
+features = [ "http1", "server", "runtime", "tcp" ]
+
+[workspace.dependencies.reqwest]
+version = "^0.11"
+default-features = false
+
+[workspace.dependencies.seccompiler]
+version = "^0.4"
+default-features = false
 
-[target.'cfg(not(target_env = "musl"))'.dev-dependencies]
-reqwest = { version = "^0.11" }
+[workspace.dependencies.syscalls]
+version = "^0.6"
+default-features = false
diff --git a/extrasafe/Cargo.toml b/extrasafe/Cargo.toml
@@ -0,0 +1,48 @@
+[package]
+name = "extrasafe"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+description = "Make your code extrasafe by reducing what it can access."
+documentation = "https://docs.rs/extrasafe/latest/extrasafe"
+readme = "README.md"
+#homepage = ""
+repository.workspace = true
+license.workspace = true
+keywords = [ "security", "seccomp", "landlock", "syscall" ]
+categories.workspace = true
+
+[package.metadata.docs.rs]
+all-features = true
+
+[features]
+landlock = [ "dep:landlock" ]
+isolate = [ ]
+
+[dependencies]
+libc.workspace = true
+seccompiler.workspace = true
+syscalls.workspace = true
+
+# Optional Dependencies:
+landlock = { workspace = true, optional = true }
+
+[dev-dependencies]
+bytes.workspace = true
+crossbeam.workspace = true
+crossbeam-queue.workspace = true
+crossbeam-channel.workspace = true
+hyper.workspace = true
+rusqlite.workspace = true
+tempfile.workspace = true
+tokio.workspace = true
+warp.workspace = true
+
+[target.'cfg(target_env = "musl")'.dev-dependencies.reqwest]
+workspace = true
+features = [ "rustls-tls" ]
+
+[target.'cfg(not(target_env = "musl"))'.dev-dependencies.reqwest]
+workspace = true
+features = [ "default" ]
diff --git a/extrasafe/README.md b/extrasafe/README.md
@@ -0,0 +1 @@
+# extrasafe
diff --git a/examples/ipc_server_with_database.rs → ...safe/examples/ipc_server_with_database.rs b/examples/ipc_server_with_database.rs → ...safe/examples/ipc_server_with_database.rs
diff --git a/examples/isolate_test.rs → extrasafe/examples/isolate_test.rs b/examples/isolate_test.rs → extrasafe/examples/isolate_test.rs
diff --git a/examples/network_server.rs → extrasafe/examples/network_server.rs b/examples/network_server.rs → extrasafe/examples/network_server.rs
diff --git a/examples/no_files_allow_stdout.rs → extrasafe/examples/no_files_allow_stdout.rs b/examples/no_files_allow_stdout.rs → extrasafe/examples/no_files_allow_stdout.rs
diff --git a/examples/server_with_database.rs → extrasafe/examples/server_with_database.rs b/examples/server_with_database.rs → extrasafe/examples/server_with_database.rs
diff --git a/examples/simple_network.rs → extrasafe/examples/simple_network.rs b/examples/simple_network.rs → extrasafe/examples/simple_network.rs
diff --git a/examples/time.rs → extrasafe/examples/time.rs b/examples/time.rs → extrasafe/examples/time.rs
diff --git a/examples/user-guide.rs → extrasafe/examples/user-guide.rs b/examples/user-guide.rs → extrasafe/examples/user-guide.rs
diff --git a/examples/user_guide_isolate.rs → extrasafe/examples/user_guide_isolate.rs b/examples/user_guide_isolate.rs → extrasafe/examples/user_guide_isolate.rs
diff --git a/src/builtins/basic.rs → extrasafe/src/builtins/basic.rs b/src/builtins/basic.rs → extrasafe/src/builtins/basic.rs
diff --git a/src/builtins/danger_zone.rs → extrasafe/src/builtins/danger_zone.rs b/src/builtins/danger_zone.rs → extrasafe/src/builtins/danger_zone.rs
diff --git a/src/builtins/mod.rs → extrasafe/src/builtins/mod.rs b/src/builtins/mod.rs → extrasafe/src/builtins/mod.rs
diff --git a/src/builtins/network.rs → extrasafe/src/builtins/network.rs b/src/builtins/network.rs → extrasafe/src/builtins/network.rs
diff --git a/src/builtins/pipes.rs → extrasafe/src/builtins/pipes.rs b/src/builtins/pipes.rs → extrasafe/src/builtins/pipes.rs
diff --git a/src/builtins/systemio.rs → extrasafe/src/builtins/systemio.rs b/src/builtins/systemio.rs → extrasafe/src/builtins/systemio.rs
diff --git a/src/builtins/time.rs → extrasafe/src/builtins/time.rs b/src/builtins/time.rs → extrasafe/src/builtins/time.rs
diff --git a/src/error.rs → extrasafe/src/error.rs b/src/error.rs → extrasafe/src/error.rs
diff --git a/src/isolate/isolate_sys.rs → extrasafe/src/isolate/isolate_sys.rs b/src/isolate/isolate_sys.rs → extrasafe/src/isolate/isolate_sys.rs
diff --git a/src/isolate/mod.rs → extrasafe/src/isolate/mod.rs b/src/isolate/mod.rs → extrasafe/src/isolate/mod.rs
diff --git a/src/landlock.rs → extrasafe/src/landlock.rs b/src/landlock.rs → extrasafe/src/landlock.rs
diff --git a/src/lib.rs → extrasafe/src/lib.rs b/src/lib.rs → extrasafe/src/lib.rs
diff --git a/src/macros.rs → extrasafe/src/macros.rs b/src/macros.rs → extrasafe/src/macros.rs
diff --git a/tests/arg_comparisons.rs → extrasafe/tests/arg_comparisons.rs b/tests/arg_comparisons.rs → extrasafe/tests/arg_comparisons.rs
diff --git a/tests/bad_combination.rs → extrasafe/tests/bad_combination.rs b/tests/bad_combination.rs → extrasafe/tests/bad_combination.rs
diff --git a/tests/default_deny.rs → extrasafe/tests/default_deny.rs b/tests/default_deny.rs → extrasafe/tests/default_deny.rs
diff --git a/tests/inherit_filters.rs → extrasafe/tests/inherit_filters.rs b/tests/inherit_filters.rs → extrasafe/tests/inherit_filters.rs
diff --git a/tests/landlock_allthreads_fail.rs → extrasafe/tests/landlock_allthreads_fail.rs b/tests/landlock_allthreads_fail.rs → extrasafe/tests/landlock_allthreads_fail.rs
diff --git a/tests/landlock_basic.rs → extrasafe/tests/landlock_basic.rs b/tests/landlock_basic.rs → extrasafe/tests/landlock_basic.rs
diff --git a/tests/landlock_conflicts.rs → extrasafe/tests/landlock_conflicts.rs b/tests/landlock_conflicts.rs → extrasafe/tests/landlock_conflicts.rs
diff --git a/tests/multiple_conditions.rs → extrasafe/tests/multiple_conditions.rs b/tests/multiple_conditions.rs → extrasafe/tests/multiple_conditions.rs
diff --git a/tests/multiple_filters.rs → extrasafe/tests/multiple_filters.rs b/tests/multiple_filters.rs → extrasafe/tests/multiple_filters.rs
diff --git a/tests/network.rs → extrasafe/tests/network.rs b/tests/network.rs → extrasafe/tests/network.rs
diff --git a/tests/open_readonly.rs → extrasafe/tests/open_readonly.rs b/tests/open_readonly.rs → extrasafe/tests/open_readonly.rs
diff --git a/tests/ruleset_union.rs → extrasafe/tests/ruleset_union.rs b/tests/ruleset_union.rs → extrasafe/tests/ruleset_union.rs
diff --git a/tests/sleep.rs → extrasafe/tests/sleep.rs b/tests/sleep.rs → extrasafe/tests/sleep.rs
diff --git a/tests/sysno.rs → extrasafe/tests/sysno.rs b/tests/sysno.rs → extrasafe/tests/sysno.rs
diff --git a/tests/test_ref_ruleset.rs → extrasafe/tests/test_ref_ruleset.rs b/tests/test_ref_ruleset.rs → extrasafe/tests/test_ref_ruleset.rs
diff --git a/tests/tests_can_fail.rs → extrasafe/tests/tests_can_fail.rs b/tests/tests_can_fail.rs → extrasafe/tests/tests_can_fail.rs
diff --git a/tests/thread_multi.rs → extrasafe/tests/thread_multi.rs b/tests/thread_multi.rs → extrasafe/tests/thread_multi.rs
diff --git a/tests/thread_single.rs → extrasafe/tests/thread_single.rs b/tests/thread_single.rs → extrasafe/tests/thread_single.rs
diff --git a/tests/unsupported_os.rs → extrasafe/tests/unsupported_os.rs b/tests/unsupported_os.rs → extrasafe/tests/unsupported_os.rs
diff --git a/tests/use_fd.rs → extrasafe/tests/use_fd.rs b/tests/use_fd.rs → extrasafe/tests/use_fd.rs