From e18bfe3e0d44fa4935ccb632f99eec07871af5a9 Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Wed, 15 Dec 2021 22:54:54 +0000 Subject: [PATCH] rename userspace feature to user Signed-off-by: Dave Tucker --- {{project-name}}-common/Cargo.toml | 2 +- {{project-name}}-common/src/lib.rs | 2 +- {{project-name}}/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{project-name}}-common/Cargo.toml b/{{project-name}}-common/Cargo.toml index 8a55d57..d82b903 100644 --- a/{{project-name}}-common/Cargo.toml +++ b/{{project-name}}-common/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" [features] default = [] -userspace = [ "aya" ] +user = [ "aya" ] [dependencies] aya = { git = "https://github.com/aya-rs/aya", branch="main", optional=true } diff --git a/{{project-name}}-common/src/lib.rs b/{{project-name}}-common/src/lib.rs index bca8a6f..34a2a6a 100644 --- a/{{project-name}}-common/src/lib.rs +++ b/{{project-name}}-common/src/lib.rs @@ -10,6 +10,6 @@ pub struct SockKey { pub local_port: u32, } -#[cfg(feature = "userspace")] +#[cfg(feature = "user")] unsafe impl aya::Pod for SockKey {} {%- endif -%} \ No newline at end of file diff --git a/{{project-name}}/Cargo.toml b/{{project-name}}/Cargo.toml index 09ce7d0..c91a00e 100644 --- a/{{project-name}}/Cargo.toml +++ b/{{project-name}}/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] aya = { git = "https://github.com/aya-rs/aya", branch="main" } -{{project-name}}-common = { path = "../{{project-name}}-common", features=["userspace"] } +{{project-name}}-common = { path = "../{{project-name}}-common", features=["user"] } anyhow = "1.0.42" ctrlc = "3.2" {% if program_type == "uprobe" %}libc = "0.2.102"{% endif %}