Revert "Remove strum_macros dependency"

This change reverts commit 2c27477 ("Remove strum_macros
dependency") for us to release a bug fix release without breaking
backwards compatibility.

Signed-off-by: Daniel Müller <[email protected]>

Author: d-e-s-o

Cargo.lock

@@ -27,7 +27,7 @@ fn prog(args: ProgArgs) {
     let opts = query::ProgInfoQueryOptions::default().include_all();
     for prog in query::ProgInfoIter::with_query_opts(opts) {
         println!(
-            "name={:<16} type={:<15?} run_count={:<2} runtime_ns={} recursion_misses={:<2}",
+            "name={:<16} type={:<15} run_count={:<2} runtime_ns={} recursion_misses={:<2}",
             prog.name.to_string_lossy(),
             prog.ty,
             prog.run_cnt,
@@ -60,7 +60,7 @@ fn prog(args: ProgArgs) {
 
 fn map() {
     for map in query::MapInfoIter::default() {
-        println!("name={:<16} type={:?}", map.name.to_string_lossy(), map.ty);
+        println!("name={:<16} type={}", map.name.to_string_lossy(), map.ty);
     }
 }
 

examples/bpf_query/src/main.rs

@@ -1,8 +1,3 @@
-Unreleased
-----------
-- Removed `Display` implementation of various `enum` types
-
-
 0.23.2
 ------
 - Fixed build failure on Android platforms

libbpf-rs/CHANGELOG.md

@@ -27,6 +27,7 @@ vendored = ["libbpf-sys/vendored"]
 bitflags = "2.0"
 libbpf-sys = { version = "1.4.1", default-features = false }
 libc = "0.2"
+strum_macros = "0.24"
 vsprintf = "2.0"
 
 [dev-dependencies]

libbpf-rs/Cargo.toml

@@ -23,6 +23,7 @@ use std::slice::from_raw_parts;
 use bitflags::bitflags;
 use libbpf_sys::bpf_map_info;
 use libbpf_sys::bpf_obj_get_info_by_fd;
+use strum_macros::Display;
 
 use crate::util;
 use crate::util::parse_ret_i32;
@@ -315,7 +316,7 @@ impl Map {
     pub fn attach_struct_ops(&self) -> Result<Link> {
         if self.map_type() != MapType::StructOps {
             return Err(Error::with_invalid_data(format!(
-                "Invalid map type ({:?}) for attach_struct_ops()",
+                "Invalid map type ({}) for attach_struct_ops()",
                 self.map_type(),
             )));
         }
@@ -634,7 +635,7 @@ impl MapHandle {
         }
         if self.map_type().is_percpu() {
             return Err(Error::with_invalid_data(format!(
-                "lookup_percpu() must be used for per-cpu maps (type of the map is {:?})",
+                "lookup_percpu() must be used for per-cpu maps (type of the map is {})",
                 self.map_type(),
             )));
         }
@@ -673,7 +674,7 @@ impl MapHandle {
     pub fn lookup_percpu(&self, key: &[u8], flags: MapFlags) -> Result<Option<Vec<Vec<u8>>>> {
         if !self.map_type().is_percpu() && self.map_type() != MapType::Unknown {
             return Err(Error::with_invalid_data(format!(
-                "lookup() must be used for maps that are not per-cpu (type of the map is {:?})",
+                "lookup() must be used for maps that are not per-cpu (type of the map is {})",
                 self.map_type(),
             )));
         }
@@ -801,7 +802,7 @@ impl MapHandle {
     pub fn update(&self, key: &[u8], value: &[u8], flags: MapFlags) -> Result<()> {
         if self.map_type().is_percpu() {
             return Err(Error::with_invalid_data(format!(
-                "update_percpu() must be used for per-cpu maps (type of the map is {:?})",
+                "update_percpu() must be used for per-cpu maps (type of the map is {})",
                 self.map_type(),
             )));
         }
@@ -880,7 +881,7 @@ impl MapHandle {
     pub fn update_percpu(&self, key: &[u8], values: &[Vec<u8>], flags: MapFlags) -> Result<()> {
         if !self.map_type().is_percpu() && self.map_type() != MapType::Unknown {
             return Err(Error::with_invalid_data(format!(
-                "update() must be used for maps that are not per-cpu (type of the map is {:?})",
+                "update() must be used for maps that are not per-cpu (type of the map is {})",
                 self.map_type(),
             )));
         }
@@ -980,7 +981,7 @@ bitflags! {
 // If you add a new per-cpu map, also update `is_percpu`.
 #[non_exhaustive]
 #[repr(u32)]
-#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Display, Debug)]
 // TODO: Document members.
 #[allow(missing_docs)]
 pub enum MapType {

libbpf-rs/src/map.rs

@@ -14,6 +14,7 @@ use std::ptr::NonNull;
 use std::slice;
 
 use libbpf_sys::bpf_func_id;
+use strum_macros::Display;
 
 use crate::util;
 use crate::AsRawLibbpf;
@@ -244,7 +245,7 @@ impl AsRawLibbpf for OpenProgram {
 /// Type of a [`Program`]. Maps to `enum bpf_prog_type` in kernel uapi.
 #[non_exhaustive]
 #[repr(u32)]
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Display, Debug)]
 // TODO: Document variants.
 #[allow(missing_docs)]
 pub enum ProgramType {
@@ -359,7 +360,7 @@ impl From<u32> for ProgramType {
 /// Attach type of a [`Program`]. Maps to `enum bpf_attach_type` in kernel uapi.
 #[non_exhaustive]
 #[repr(u32)]
-#[derive(Clone, Debug)]
+#[derive(Clone, Display, Debug)]
 // TODO: Document variants.
 #[allow(missing_docs)]
 pub enum ProgramAttachType {