Merge branch '⬆️-bitflags-2' into 🦆

Author: yvt

Cargo.lock

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 
 - **Breaking:** `{Bind,Hunk}Definer::zeroed` now requires `T: Zeroable` instead of `T: ZeroInit`.
+- **Breaking:** Upgrade `bitflags` to [`^2`](https://github.com/bitflags/bitflags/releases/tag/2.0.0), changing `EventGroupWaitFlags` in subtle ways:
+    - It no longer exposes the `bits` field. Use the `bits` method to get a raw value.
+    - The unsafe `from_bits_unchecked` method has been superseded by the safe `from_bits_retain` method.
 
 ### Added
 

src/r3_core/CHANGELOG.md

@@ -29,7 +29,7 @@ svgbobdoc = { version = "0.3.0" }
 tokenlock = { version = "0.3.4", default-features = false }
 arrayvec = { version = "0.7.1", default-features = false }
 bytemuck = { version = "1.12.3", features = ["derive"] }
-bitflags = { version = "1.2.1" }
+bitflags = { version = "2.0.2" }
 macropol = { version = "0.1.2" }
 either = { version = "1.6.1", default-features = false }
 elain = { version = "0.3.0" }

src/r3_core/Cargo.toml

@@ -388,6 +388,7 @@ bitflags::bitflags! {
     /// Options for [`EventGroup::wait`][1].
     ///
     /// [1]: crate::kernel::event_group::EventGroupMethods::wait
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct EventGroupWaitFlags: u8 {
         /// Wait for all of the specified bits to be set.
         const ALL = 1 << 0;

src/r3_core/src/kernel/raw.rs

@@ -35,7 +35,7 @@ num-traits = { version = "0.2.11", default-features = false }
 svgbobdoc = { version = "0.3.0" }
 tokenlock = { version = "0.3.4", default-features = false }
 arrayvec = { version = "0.7.1", default-features = false }
-bitflags = { version = "1.2.1" }
+bitflags = { version = "2.0.2" }
 macropol = { version = "0.1.2" }
 chrono = { version = "0.4.13", optional = true, default-features = false }
 either = { version = "1.6.1", default-features = false }

src/r3_kernel/Cargo.toml

@@ -92,6 +92,7 @@ impl Init for InterruptLineInit {
 bitflags::bitflags! {
     /// Flags for [`InterruptLineInit`].
     #[doc(hidden)]
+    #[derive(Debug, Clone, Copy)]
     pub struct InterruptLineInitFlags: u32 {
         const ENABLE = 1 << 0;
         const SET_PRIORITY = 1 << 1;