diff options
| author | Andrej Mihajlov <and.mikhaylov@gmail.com> | 2024-03-07 11:23:36 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-03-07 14:39:38 +0100 |
| commit | 9cf15cb93974efddfabadc21fbea0cd9abe72e6d (patch) | |
| tree | 944bdbd715908ec4106ca225f5febe31b2b75542 | |
| parent | f6106bb1f35c3e85d03e487242745055cec427e9 (diff) | |
| download | mullvadvpn-9cf15cb93974efddfabadc21fbea0cd9abe72e6d.tar.xz mullvadvpn-9cf15cb93974efddfabadc21fbea0cd9abe72e6d.zip | |
Update bitflags to v2
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | talpid-routing/Cargo.toml | 2 | ||||
| -rw-r--r-- | talpid-routing/src/unix/macos/data.rs | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index 6df6a86a51..4b225166b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3671,7 +3671,7 @@ dependencies = [ name = "talpid-routing" version = "0.0.0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "futures", "ipnetwork", "libc", diff --git a/talpid-routing/Cargo.toml b/talpid-routing/Cargo.toml index cf2f3c9ade..16b9468063 100644 --- a/talpid-routing/Cargo.toml +++ b/talpid-routing/Cargo.toml @@ -31,7 +31,7 @@ netlink-sys = "0.8.3" # TODO: The PF socket type isn't released yet nix = { git = "https://github.com/nix-rust/nix", rev = "b13b7d18e0d2f4a8c05e41576c7ebf26d6dbfb28", features = ["socket"] } libc = "0.2" -bitflags = "1.2" +bitflags = "2" system-configuration = "0.5.1" diff --git a/talpid-routing/src/unix/macos/data.rs b/talpid-routing/src/unix/macos/data.rs index 0028466ed0..4d2aa3362f 100644 --- a/talpid-routing/src/unix/macos/data.rs +++ b/talpid-routing/src/unix/macos/data.rs @@ -655,6 +655,7 @@ impl Interface { bitflags::bitflags! { /// All enum values of address flags can be iterated via `flag <<= 1`, starting from 1. /// See https://www.manpagez.com/man/4/route/. + #[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Copy, Clone)] pub struct AddressFlag: i32 { /// Destination socket address const RTA_DST = libc::RTA_DST; @@ -678,6 +679,7 @@ bitflags::bitflags! { bitflags::bitflags! { /// Types of routing messages /// See https://www.manpagez.com/man/4/route/. + #[derive(Debug)] pub struct MessageType: i32 { /// Add Route const RTM_ADD = libc::RTM_ADD; @@ -715,6 +717,7 @@ bitflags::bitflags! { /// Routing message flags /// See https://www.manpagez.com/man/4/route/. + #[derive(Debug, Copy, Clone, PartialEq, Eq)] pub struct RouteFlag: i32 { /// route usable const RTF_UP = libc::RTF_UP; |