Bump bitflags to 2.0

Update the bitflags dependency to 2.0. Some changes to this new major
version were breaking our code and required adjustments. See
https://github.com/bitflags/bitflags/releases/tag/2.0.0 for relevant
details.

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

Author: d-e-s-o

Cargo.lock

@@ -2,6 +2,7 @@ Unreleased
 ----------
 - Enabled key iteration on `MapHandle` objects (formerly possible only on `Map`
   objects)
+- Updated `bitflags` dependency to `2.0`
 - Bumped minimum Rust version to `1.64`
 
 

libbpf-rs/CHANGELOG.md

@@ -21,7 +21,7 @@ novendor = ["libbpf-sys/novendor"]
 static = ["libbpf-sys/static"]
 
 [dependencies]
-bitflags = "1.3"
+bitflags = "2.0"
 lazy_static = "1.4"
 libbpf-sys = { version = "1.0.3" }
 libc = "0.2"

libbpf-rs/Cargo.toml

@@ -549,7 +549,7 @@ impl MapHandle {
                 self.fd.as_raw_fd(),
                 self.map_key(key),
                 out.as_mut_ptr() as *mut c_void,
-                flags.bits,
+                flags.bits(),
             )
         };
 
@@ -584,7 +584,7 @@ impl MapHandle {
                 self.fd.as_raw_fd(),
                 self.map_key(key),
                 value.as_ptr() as *const c_void,
-                flags.bits,
+                flags.bits(),
             )
         };
 
@@ -675,8 +675,8 @@ impl MapHandle {
 
         let opts = libbpf_sys::bpf_map_batch_opts {
             sz: mem::size_of::<libbpf_sys::bpf_map_batch_opts>() as _,
-            elem_flags: elem_flags.bits,
-            flags: flags.bits,
+            elem_flags: elem_flags.bits(),
+            flags: flags.bits(),
         };
 
         let mut count = count;
@@ -853,6 +853,7 @@ impl AsFd for MapHandle {
 
 bitflags! {
     /// Flags to configure [`Map`] operations.
+    #[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone, Copy)]
     pub struct MapFlags: u64 {
         /// See [`libbpf_sys::BPF_ANY`].
         const ANY      = libbpf_sys::BPF_ANY as _;