chore(aya-ebpf-macros): Rename bpf -> ebpf

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>

.mergify.yml

@@ -52,7 +52,7 @@ pull_request_rules:
 
   - name: add labels for aya-bpf PRs
     conditions:
-      - files~=^(aya-bpf-macros|bpf/aya-bpf(-(cty|bindings))?)/
+      - files~=^(aya-ebpf-macros|bpf/aya-bpf(-(cty|bindings))?)/
     actions:
       label:
         add:

Cargo.toml

@@ -11,7 +11,7 @@ members = [
     "xtask",
 
     # macros
-    "aya-bpf-macros",
+    "aya-ebpf-macros",
     "aya-log-ebpf-macros",
 
     # ebpf crates
@@ -35,7 +35,7 @@ default-members = [
     # tests, and that doesn't work unless they've been built with `cargo xtask`.
     "xtask",
 
-    "aya-bpf-macros",
+    "aya-ebpf-macros",
     "aya-log-ebpf-macros",
 
     # ebpf crates are omitted; they must be built with:

aya-ebpf-macros/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "aya-bpf-macros"
+name = "aya-ebpf-macros"
 version = "0.1.0"
 description = "Proc macros used by aya-ebpf"
 authors.workspace = true

ebpf/aya-ebpf/Cargo.toml

@@ -10,7 +10,7 @@ edition.workspace = true
 
 [dependencies]
 aya-ebpf-cty = { path = "../aya-ebpf-cty" }
-aya-bpf-macros = { path = "../../aya-bpf-macros" }
+aya-ebpf-macros = { path = "../../aya-ebpf-macros" }
 aya-ebpf-bindings = { path = "../aya-ebpf-bindings" }
 const-assert = { workspace = true, optional = true }
 

ebpf/aya-ebpf/src/lib.rs

@@ -29,8 +29,8 @@ pub mod programs;
 
 use core::ffi::c_void;
 
-pub use aya_bpf_macros as macros;
 pub use aya_ebpf_cty as cty;
+pub use aya_ebpf_macros as macros;
 use cty::{c_int, c_long};
 use helpers::{bpf_get_current_comm, bpf_get_current_pid_tgid, bpf_get_current_uid_gid};