Skip to content

Commit a496e05

Browse files
committed
Merge branch 'dependabot/cargo/base64-0.22' of https://github.com/swimos/swim-rust into dependabot/cargo/base64-0.22
2 parents 63c9cf0 + 940b425 commit a496e05

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ num-bigint = "0.4"
9191
ratchet = { package = "ratchet_rs", version = "0.4" }
9292
ratchet_fixture = "0.4"
9393
flate2 = "1.0.22"
94-
bitflags = "1.3"
94+
bitflags = "2.5"
9595
rocksdb = "0.22"
9696
integer-encoding = "3.0.4"
9797
rustls = "0.20"

runtime/swimos_runtime/src/downlink/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,14 @@ mod tests;
5454
bitflags! {
5555
/// Flags that a downlink consumer can set to instruct the downlink runtime how it wishes
5656
/// to be driven.
57+
#[derive(Debug, Copy, Clone)]
5758
pub struct DownlinkOptions: u8 {
5859
/// The consumer needs to be synchronized with the remote lane.
5960
const SYNC = 0b01;
6061
/// If the connection fails, it should be restarted and the consumer passed to the new
6162
/// connection.
6263
const KEEP_LINKED = 0b10;
63-
const DEFAULT = Self::SYNC.bits | Self::KEEP_LINKED.bits;
64+
const DEFAULT = Self::SYNC.bits() | Self::KEEP_LINKED.bits();
6465
}
6566
}
6667

@@ -72,7 +73,7 @@ bitflags! {
7273
/// A new consumer that needs to be synced has joined why a write was pending.
7374
const NEEDS_SYNC = 0b10;
7475
/// When the task starts it does not need to be flushed.
75-
const INIT = Self::FLUSHED.bits;
76+
const INIT = Self::FLUSHED.bits();
7677
}
7778
}
7879

server/swimos_agent/src/agent_model/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl ItemKind {
120120
}
121121

122122
bitflags! {
123-
#[derive(Default)]
123+
#[derive(Default, Copy, Clone, Hash, Debug, PartialEq, Eq)]
124124
pub struct ItemFlags: u8 {
125125
/// The state of the item should not be persisted.
126126
const TRANSIENT = 0b01;

server/swimos_agent/src/event_handler/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ pub enum EventHandlerError {
328328
}
329329

330330
bitflags! {
331-
331+
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
332332
pub struct ModificationFlags: u8 {
333333
/// The lane has data to write.
334334
const DIRTY = 0b01;

server/swimos_agent_derive/src/lane_model_derive/model.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ impl<'a> ItemSpec<'a> {
179179

180180
bitflags! {
181181

182-
#[derive(Default)]
182+
#[derive(Default, Debug, Copy, Clone)]
183183
pub struct ItemFlags: u8 {
184184
/// The state of the lane should not be persisted.
185185
const TRANSIENT = 0b01;

0 commit comments

Comments
 (0)