Merge remote-tracking branch 'ds-cbo/bump-bitflags'

dlon · dlon · commit 3367a6fae903 · 2023-12-21T20:59:49.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,3 +3,4 @@ members = [
     "system-configuration-sys",
     "system-configuration",
 ]
+resolver = "2"
diff --git a/system-configuration-sys/Cargo.toml b/system-configuration-sys/Cargo.toml
@@ -11,4 +11,4 @@ edition = "2021"
 
 [dependencies]
 core-foundation-sys = "0.8"
-libc = "0.2.49"
+libc = "0.2.149"
diff --git a/system-configuration/Cargo.toml b/system-configuration/Cargo.toml
@@ -13,4 +13,4 @@ edition = "2021"
 [dependencies]
 core-foundation = "0.9"
 system-configuration-sys = { path = "../system-configuration-sys", version = "0.5" }
-bitflags = "1"
+bitflags = "2"
diff --git a/system-configuration/src/network_reachability.rs b/system-configuration/src/network_reachability.rs
@@ -297,7 +297,7 @@ impl<T: Fn(ReachabilityFlags) + Sync + Send> NetworkReachabilityCallbackContext<
         context: *mut c_void,
     ) {
         let context: &mut Self = unsafe { &mut (*(context as *mut _)) };
-        (context.callback)(unsafe { ReachabilityFlags::from_bits_unchecked(flags) });
+        (context.callback)(ReachabilityFlags::from_bits_retain(flags));
     }
 
     extern "C" fn copy_ctx_description(_ctx: *const c_void) -> CFStringRef {

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ impl<T: Fn(ReachabilityFlags) + Sync + Send> NetworkReachabilityCallbackContext<`
`297`	`297`	`context: *mut c_void,`
`298`	`298`	`) {`
`299`	`299`	`let context: &mut Self = unsafe { &mut ((context as mut _)) };`
`300`		`- (context.callback)(unsafe { ReachabilityFlags::from_bits_unchecked(flags) });`
	`300`	`+ (context.callback)(ReachabilityFlags::from_bits_retain(flags));`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`extern "C" fn copy_ctx_description(_ctx: *const c_void) -> CFStringRef {`