From 2e5bc8b2038b6847baad1cf11b0697b5bc67a028 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Wed, 26 Apr 2023 14:04:44 +0100
Subject: Update to bitflags 2.3.1.

This is a new major version and requires some code changes.
---
 Cargo.toml         | 2 +-
 src/macros.rs      | 1 +
 src/sys/termios.rs | 2 +-
 src/sys/time.rs    | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ee3882ac..243f309d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@ targets = [
 
 [dependencies]
 libc = { version = "0.2.141", features = ["extra_traits"] }
-bitflags = "1.1"
+bitflags = "2.3.1"
 cfg-if = "1.0"
 pin-utils = { version = "0.1.0", optional = true }
 static_assertions = "1"
diff --git a/src/macros.rs b/src/macros.rs
index 5d83a5ac..2d356441 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -63,6 +63,7 @@ macro_rules! libc_bitflags {
         }
     ) => {
         ::bitflags::bitflags! {
+            #[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
             $(#[$outer])*
             pub struct $BitFlags: $T {
                 $(
diff --git a/src/sys/termios.rs b/src/sys/termios.rs
index b0286f51..0f1c9950 100644
--- a/src/sys/termios.rs
+++ b/src/sys/termios.rs
@@ -309,7 +309,7 @@ impl Termios {
         let termios = *self.inner.borrow_mut();
         self.input_flags = InputFlags::from_bits_truncate(termios.c_iflag);
         self.output_flags = OutputFlags::from_bits_truncate(termios.c_oflag);
-        self.control_flags = ControlFlags::from_bits_truncate(termios.c_cflag);
+        self.control_flags = ControlFlags::from_bits_retain(termios.c_cflag);
         self.local_flags = LocalFlags::from_bits_truncate(termios.c_lflag);
         self.control_chars = termios.c_cc;
         #[cfg(any(
diff --git a/src/sys/time.rs b/src/sys/time.rs
index 30ee5fd1..a0160e21 100644
--- a/src/sys/time.rs
+++ b/src/sys/time.rs
@@ -91,6 +91,7 @@ pub(crate) mod timer {
     #[cfg(any(target_os = "android", target_os = "linux"))]
     bitflags! {
         /// Flags that are used for arming the timer.
+        #[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
         pub struct TimerSetTimeFlags: libc::c_int {
             const TFD_TIMER_ABSTIME = libc::TFD_TIMER_ABSTIME;
             const TFD_TIMER_CANCEL_ON_SET = libc::TFD_TIMER_CANCEL_ON_SET;
@@ -104,6 +105,7 @@ pub(crate) mod timer {
     ))]
     bitflags! {
         /// Flags that are used for arming the timer.
+        #[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
         pub struct TimerSetTimeFlags: libc::c_int {
             const TFD_TIMER_ABSTIME = libc::TIMER_ABSTIME;
         }
-- 
cgit v1.2.3