Move all crates to workspace root

Having all the workspace crates under the crates/ directory is unnecessary. Rust documentation itself recommends all crates to be in the root directory: https://doc.rust-lang.org/book/ch14-03-cargo-workspaces.html#creating-the-second-package-in-the-workspace I paste the text content here, in case the online page ever changes or becomes unavailable: ## Creating the Second Package in the Workspace Next, let’s create another member package in the workspace and call it add_one. Change the top-level Cargo.toml to specify the add_one path in the members list: Filename: Cargo.toml [workspace] members = [ "adder", "add_one", ] Then generate a new library crate named add_one: $ cargo new add_one --lib Created library `add_one` package Your add directory should now have these directories and files: ├── Cargo.lock ├── Cargo.toml ├── add_one │ ├── Cargo.toml │ └── src │ └── lib.rs ├── adder │ ├── Cargo.toml │ └── src │ └── main.rs └── target Signed-off-by: Manos Pitsidianakis <[email protected]>
rust-vmm · Dec 7, 2023 · 3b09172 · 3b09172
1 parent 59c604f
commit 3b09172
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 members = [
-    "crates/vfio-bindings",
-    "crates/vfio-ioctls",
+    "vfio-bindings",
+    "vfio-ioctls",
 ]
 resolver = "2"
diff --git a/README.md b/README.md
@@ -19,8 +19,8 @@ While the group is the minimum granularity that must be used to ensure secure us
 
 ## Usage
 This repository provides two crates to use the VFIO framework, please refer to crate documentations for detail information.
-- [vfio-bindings](https://github.com/rust-vmm/vfio-ioctls/tree/ioctls/crates/vfio-bindings): a rust FFI bindings to VFIO generated using [bindgen](https://crates.io/crates/bindgen).
-- [vfio-ioctls](https://github.com/rust-vmm/vfio-ioctls/tree/ioctls/crates/vfio-ioctls): a group of safe wrappers over the [VFIO APIs](https://github.com/torvalds/linux/blob/master/include/uapi/linux/vfio.h).
+- [vfio-bindings](./vfio-bindings): a rust FFI bindings to VFIO generated using [bindgen](https://crates.io/crates/bindgen).
+- [vfio-ioctls](./vfio-ioctls): a group of safe wrappers over the [VFIO APIs](https://github.com/torvalds/linux/blob/master/include/uapi/linux/vfio.h).
 
 ## License
 

diff --git a/crates/vfio-bindings/CHANGELOG.md → vfio-bindings/CHANGELOG.md b/crates/vfio-bindings/CHANGELOG.md → vfio-bindings/CHANGELOG.md
diff --git a/crates/vfio-bindings/CONTRIBUTING.md → vfio-bindings/CONTRIBUTING.md b/crates/vfio-bindings/CONTRIBUTING.md → vfio-bindings/CONTRIBUTING.md
diff --git a/crates/vfio-bindings/Cargo.toml → vfio-bindings/Cargo.toml b/crates/vfio-bindings/Cargo.toml → vfio-bindings/Cargo.toml
diff --git a/crates/vfio-bindings/LICENSE-APACHE → vfio-bindings/LICENSE-APACHE b/crates/vfio-bindings/LICENSE-APACHE → vfio-bindings/LICENSE-APACHE
diff --git a/crates/vfio-bindings/LICENSE-BSD → vfio-bindings/LICENSE-BSD b/crates/vfio-bindings/LICENSE-BSD → vfio-bindings/LICENSE-BSD
diff --git a/crates/vfio-bindings/README.md → vfio-bindings/README.md b/crates/vfio-bindings/README.md → vfio-bindings/README.md
diff --git a/.../vfio-bindings/src/bindings_v5_0_0/mod.rs → vfio-bindings/src/bindings_v5_0_0/mod.rs b/.../vfio-bindings/src/bindings_v5_0_0/mod.rs → vfio-bindings/src/bindings_v5_0_0/mod.rs
diff --git a/...vfio-bindings/src/bindings_v5_0_0/vfio.rs → vfio-bindings/src/bindings_v5_0_0/vfio.rs b/...vfio-bindings/src/bindings_v5_0_0/vfio.rs → vfio-bindings/src/bindings_v5_0_0/vfio.rs
diff --git a/crates/vfio-bindings/src/fam_wrappers.rs → vfio-bindings/src/fam_wrappers.rs b/crates/vfio-bindings/src/fam_wrappers.rs → vfio-bindings/src/fam_wrappers.rs
diff --git a/crates/vfio-bindings/src/lib.rs → vfio-bindings/src/lib.rs b/crates/vfio-bindings/src/lib.rs → vfio-bindings/src/lib.rs
diff --git a/crates/vfio-ioctls/Cargo.toml → vfio-ioctls/Cargo.toml b/crates/vfio-ioctls/Cargo.toml → vfio-ioctls/Cargo.toml
diff --git a/crates/vfio-ioctls/LICENSE-APACHE → vfio-ioctls/LICENSE-APACHE b/crates/vfio-ioctls/LICENSE-APACHE → vfio-ioctls/LICENSE-APACHE
diff --git a/crates/vfio-ioctls/LICENSE-BSD → vfio-ioctls/LICENSE-BSD b/crates/vfio-ioctls/LICENSE-BSD → vfio-ioctls/LICENSE-BSD
diff --git a/crates/vfio-ioctls/README.md → vfio-ioctls/README.md b/crates/vfio-ioctls/README.md → vfio-ioctls/README.md
diff --git a/crates/vfio-ioctls/src/fam.rs → vfio-ioctls/src/fam.rs b/crates/vfio-ioctls/src/fam.rs → vfio-ioctls/src/fam.rs
diff --git a/crates/vfio-ioctls/src/lib.rs → vfio-ioctls/src/lib.rs b/crates/vfio-ioctls/src/lib.rs → vfio-ioctls/src/lib.rs
diff --git a/crates/vfio-ioctls/src/vfio_device.rs → vfio-ioctls/src/vfio_device.rs b/crates/vfio-ioctls/src/vfio_device.rs → vfio-ioctls/src/vfio_device.rs
diff --git a/crates/vfio-ioctls/src/vfio_ioctls.rs → vfio-ioctls/src/vfio_ioctls.rs b/crates/vfio-ioctls/src/vfio_ioctls.rs → vfio-ioctls/src/vfio_ioctls.rs