Rename sel4-bitfield-types -> sel4-bitfield-ops

Signed-off-by: Nick Spinale <[email protected]>
seL4 · Oct 4, 2023 · 6f8ac12 · 6f8ac12
1 parent 99b70f3
commit 6f8ac12
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -110,9 +110,9 @@ members = [
     "crates/sel4-shared-ring-buffer/block-io/types",
     "crates/sel4-shared-ring-buffer/smoltcp",
     "crates/sel4-sync",
+    "crates/sel4/bitfield-ops",
     "crates/sel4/bitfield-parser",
     "crates/sel4/bitfield-parser/test",
-    "crates/sel4/bitfield-types",
     "crates/sel4/build-env",
     "crates/sel4/config",
     "crates/sel4/config/data",

diff --git a/crates/sel4/bitfield-types/Cargo.toml → crates/sel4/bitfield-ops/Cargo.toml b/crates/sel4/bitfield-types/Cargo.toml → crates/sel4/bitfield-ops/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sel4-bitfield-types"
+name = "sel4-bitfield-ops"
 version = "0.1.0"
 authors = ["Nick Spinale <[email protected]>"]
 edition = "2021"

diff --git a/crates/sel4/bitfield-types/src/lib.rs → crates/sel4/bitfield-ops/src/lib.rs b/crates/sel4/bitfield-types/src/lib.rs → crates/sel4/bitfield-ops/src/lib.rs
diff --git a/crates/sel4/sys/Cargo.toml b/crates/sel4/sys/Cargo.toml
@@ -11,7 +11,7 @@ wrappers = []
 
 [dependencies]
 log = "0.4.17"
-sel4-bitfield-types = { path = "../bitfield-types" }
+sel4-bitfield-ops = { path = "../bitfield-ops" }
 sel4-config = { path = "../config" }
 
 [build-dependencies]

diff --git a/crates/sel4/sys/src/bf/types.rs b/crates/sel4/sys/src/bf/types.rs
@@ -1,6 +1,6 @@
 use core::ops::Range;
 
-use sel4_bitfield_types::{get_bits, set_bits, UnsignedPrimInt};
+use sel4_bitfield_ops::{get_bits, set_bits, UnsignedPrimInt};
 
 #[repr(C)]
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]

diff --git a/crates/sel4/sys/src/ipc_buffer.rs b/crates/sel4/sys/src/ipc_buffer.rs
@@ -2,7 +2,7 @@ use core::mem;
 use core::ops::Range;
 use core::slice;
 
-use sel4_bitfield_types::{get_bits, set_bits, PrimInt};
+use sel4_bitfield_ops::{get_bits, set_bits, PrimInt};
 
 use crate::{seL4_CPtr, seL4_IPCBuffer, seL4_Word};
 

diff --git a/hacking/cargo-manifest-sources/crates/sel4/bitfield-ops/crate.nix b/hacking/cargo-manifest-sources/crates/sel4/bitfield-ops/crate.nix
@@ -0,0 +1,5 @@
+{ mk }:
+
+mk {
+  package.name = "sel4-bitfield-ops";
+}
diff --git a/hacking/cargo-manifest-sources/crates/sel4/bitfield-types/crate.nix b/hacking/cargo-manifest-sources/crates/sel4/bitfield-types/crate.nix
diff --git a/hacking/cargo-manifest-sources/crates/sel4/sys/crate.nix b/hacking/cargo-manifest-sources/crates/sel4/sys/crate.nix
@@ -20,7 +20,7 @@ mk {
   };
   nix.local.dependencies = with localCrates; [
     sel4-config
-    sel4-bitfield-types
+    sel4-bitfield-ops
   ];
   nix.local.build-dependencies = with localCrates; [
     sel4-build-env