From 3b0917213bc33ccca53e98123087453b4171d632 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Tue, 26 Sep 2023 12:50:17 +0300 Subject: [PATCH] Move all crates to workspace root MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- Cargo.toml | 4 ++-- README.md | 4 ++-- {crates/vfio-bindings => vfio-bindings}/CHANGELOG.md | 0 {crates/vfio-bindings => vfio-bindings}/CONTRIBUTING.md | 0 {crates/vfio-bindings => vfio-bindings}/Cargo.toml | 0 {crates/vfio-bindings => vfio-bindings}/LICENSE-APACHE | 0 {crates/vfio-bindings => vfio-bindings}/LICENSE-BSD | 0 {crates/vfio-bindings => vfio-bindings}/README.md | 0 .../src/bindings_v5_0_0/mod.rs | 0 .../src/bindings_v5_0_0/vfio.rs | 0 {crates/vfio-bindings => vfio-bindings}/src/fam_wrappers.rs | 0 {crates/vfio-bindings => vfio-bindings}/src/lib.rs | 0 {crates/vfio-ioctls => vfio-ioctls}/Cargo.toml | 0 {crates/vfio-ioctls => vfio-ioctls}/LICENSE-APACHE | 0 {crates/vfio-ioctls => vfio-ioctls}/LICENSE-BSD | 0 {crates/vfio-ioctls => vfio-ioctls}/README.md | 0 {crates/vfio-ioctls => vfio-ioctls}/src/fam.rs | 0 {crates/vfio-ioctls => vfio-ioctls}/src/lib.rs | 0 {crates/vfio-ioctls => vfio-ioctls}/src/vfio_device.rs | 0 {crates/vfio-ioctls => vfio-ioctls}/src/vfio_ioctls.rs | 0 20 files changed, 4 insertions(+), 4 deletions(-) rename {crates/vfio-bindings => vfio-bindings}/CHANGELOG.md (100%) rename {crates/vfio-bindings => vfio-bindings}/CONTRIBUTING.md (100%) rename {crates/vfio-bindings => vfio-bindings}/Cargo.toml (100%) rename {crates/vfio-bindings => vfio-bindings}/LICENSE-APACHE (100%) rename {crates/vfio-bindings => vfio-bindings}/LICENSE-BSD (100%) rename {crates/vfio-bindings => vfio-bindings}/README.md (100%) rename {crates/vfio-bindings => vfio-bindings}/src/bindings_v5_0_0/mod.rs (100%) rename {crates/vfio-bindings => vfio-bindings}/src/bindings_v5_0_0/vfio.rs (100%) rename {crates/vfio-bindings => vfio-bindings}/src/fam_wrappers.rs (100%) rename {crates/vfio-bindings => vfio-bindings}/src/lib.rs (100%) rename {crates/vfio-ioctls => vfio-ioctls}/Cargo.toml (100%) rename {crates/vfio-ioctls => vfio-ioctls}/LICENSE-APACHE (100%) rename {crates/vfio-ioctls => vfio-ioctls}/LICENSE-BSD (100%) rename {crates/vfio-ioctls => vfio-ioctls}/README.md (100%) rename {crates/vfio-ioctls => vfio-ioctls}/src/fam.rs (100%) rename {crates/vfio-ioctls => vfio-ioctls}/src/lib.rs (100%) rename {crates/vfio-ioctls => vfio-ioctls}/src/vfio_device.rs (100%) rename {crates/vfio-ioctls => vfio-ioctls}/src/vfio_ioctls.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 43cc3a0..c411e96 100644 --- 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 index f7b06fa..fbd8734 100644 --- 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 b/vfio-bindings/CHANGELOG.md similarity index 100% rename from crates/vfio-bindings/CHANGELOG.md rename to vfio-bindings/CHANGELOG.md diff --git a/crates/vfio-bindings/CONTRIBUTING.md b/vfio-bindings/CONTRIBUTING.md similarity index 100% rename from crates/vfio-bindings/CONTRIBUTING.md rename to vfio-bindings/CONTRIBUTING.md diff --git a/crates/vfio-bindings/Cargo.toml b/vfio-bindings/Cargo.toml similarity index 100% rename from crates/vfio-bindings/Cargo.toml rename to vfio-bindings/Cargo.toml diff --git a/crates/vfio-bindings/LICENSE-APACHE b/vfio-bindings/LICENSE-APACHE similarity index 100% rename from crates/vfio-bindings/LICENSE-APACHE rename to vfio-bindings/LICENSE-APACHE diff --git a/crates/vfio-bindings/LICENSE-BSD b/vfio-bindings/LICENSE-BSD similarity index 100% rename from crates/vfio-bindings/LICENSE-BSD rename to vfio-bindings/LICENSE-BSD diff --git a/crates/vfio-bindings/README.md b/vfio-bindings/README.md similarity index 100% rename from crates/vfio-bindings/README.md rename to vfio-bindings/README.md diff --git a/crates/vfio-bindings/src/bindings_v5_0_0/mod.rs b/vfio-bindings/src/bindings_v5_0_0/mod.rs similarity index 100% rename from crates/vfio-bindings/src/bindings_v5_0_0/mod.rs rename to vfio-bindings/src/bindings_v5_0_0/mod.rs diff --git a/crates/vfio-bindings/src/bindings_v5_0_0/vfio.rs b/vfio-bindings/src/bindings_v5_0_0/vfio.rs similarity index 100% rename from crates/vfio-bindings/src/bindings_v5_0_0/vfio.rs rename to vfio-bindings/src/bindings_v5_0_0/vfio.rs diff --git a/crates/vfio-bindings/src/fam_wrappers.rs b/vfio-bindings/src/fam_wrappers.rs similarity index 100% rename from crates/vfio-bindings/src/fam_wrappers.rs rename to vfio-bindings/src/fam_wrappers.rs diff --git a/crates/vfio-bindings/src/lib.rs b/vfio-bindings/src/lib.rs similarity index 100% rename from crates/vfio-bindings/src/lib.rs rename to vfio-bindings/src/lib.rs diff --git a/crates/vfio-ioctls/Cargo.toml b/vfio-ioctls/Cargo.toml similarity index 100% rename from crates/vfio-ioctls/Cargo.toml rename to vfio-ioctls/Cargo.toml diff --git a/crates/vfio-ioctls/LICENSE-APACHE b/vfio-ioctls/LICENSE-APACHE similarity index 100% rename from crates/vfio-ioctls/LICENSE-APACHE rename to vfio-ioctls/LICENSE-APACHE diff --git a/crates/vfio-ioctls/LICENSE-BSD b/vfio-ioctls/LICENSE-BSD similarity index 100% rename from crates/vfio-ioctls/LICENSE-BSD rename to vfio-ioctls/LICENSE-BSD diff --git a/crates/vfio-ioctls/README.md b/vfio-ioctls/README.md similarity index 100% rename from crates/vfio-ioctls/README.md rename to vfio-ioctls/README.md diff --git a/crates/vfio-ioctls/src/fam.rs b/vfio-ioctls/src/fam.rs similarity index 100% rename from crates/vfio-ioctls/src/fam.rs rename to vfio-ioctls/src/fam.rs diff --git a/crates/vfio-ioctls/src/lib.rs b/vfio-ioctls/src/lib.rs similarity index 100% rename from crates/vfio-ioctls/src/lib.rs rename to vfio-ioctls/src/lib.rs diff --git a/crates/vfio-ioctls/src/vfio_device.rs b/vfio-ioctls/src/vfio_device.rs similarity index 100% rename from crates/vfio-ioctls/src/vfio_device.rs rename to vfio-ioctls/src/vfio_device.rs diff --git a/crates/vfio-ioctls/src/vfio_ioctls.rs b/vfio-ioctls/src/vfio_ioctls.rs similarity index 100% rename from crates/vfio-ioctls/src/vfio_ioctls.rs rename to vfio-ioctls/src/vfio_ioctls.rs