rust edition 2024 compatibility changes for fbcode

cjlongoria · facebook-github-bot · commit 5be6c94ddcab · 2025-05-30T16:02:33.000-07:00
Summary: X-link: meta-pytorch/monarch#84 X-link: meta-pytorch/monarch#71 applying changes to make the code compatible with both 2021 and 2024 rust editions Reviewed By: dtolnay Differential Revision: D75642573 fbshipit-source-id: 8b5606574940cddb60f35d2a6321412df2552868
diff --git a/eden/scm/exec/hgmain/src/buildinfo.rs b/eden/scm/exec/hgmain/src/buildinfo.rs
@@ -7,6 +7,6 @@
 
 #[cfg(feature = "buildinfo")]
 #[link(name = "buildinfo", kind = "static")]
-extern "C" {
+unsafe extern "C" {
     pub fn print_buildinfo();
 }
diff --git a/eden/scm/lib/commandserver/src/client.rs b/eden/scm/lib/commandserver/src/client.rs
@@ -153,14 +153,14 @@ fn forward_signals(props: &ProcessProps) {
     static PID: AtomicU32 = AtomicU32::new(0);
     static PGID: AtomicU32 = AtomicU32::new(0);
 
-    extern "C" fn forward_signal_process(sig: libc::c_int) {
+    unsafe extern "C" fn forward_signal_process(sig: libc::c_int) {
         let pid = PID.load(Ordering::Acquire);
         if pid > 0 {
             unsafe { libc::kill(pid as i32, sig) };
         }
     }
 
-    extern "C" fn forward_signal_group(sig: libc::c_int) {
+    unsafe extern "C" fn forward_signal_group(sig: libc::c_int) {
         let pgid = PGID.load(Ordering::Acquire);
         if pgid > 1 {
             unsafe { libc::kill(-(pgid as i32), sig) };
diff --git a/eden/scm/lib/procinfo/src/lib.rs b/eden/scm/lib/procinfo/src/lib.rs
@@ -6,7 +6,7 @@
  */
 
 #[cfg(target_os = "macos")]
-extern "C" {
+unsafe extern "C" {
     fn darwin_ppid(pid: u32) -> u32;
     fn darwin_exepath(pid: u32) -> *const libc::c_char;
 }
diff --git a/eden/scm/lib/third-party/conch-parser/BUCK b/eden/scm/lib/third-party/conch-parser/BUCK
@@ -14,6 +14,7 @@ rust_library(
             },
         },
     },
+    edition = "2021",
     deps = [
         "fbsource//third-party/rust:serde",
         "fbsource//third-party/rust:void",
diff --git a/eden/scm/lib/third-party/streampager/BUCK b/eden/scm/lib/third-party/streampager/BUCK
@@ -43,6 +43,7 @@ rust_library(
             "version": "0.11.0",
         },
     }},
+    edition = "2021",
     features = ["toml_config"],
     deps = [
         "fbsource//third-party/rust:dirs",
diff --git a/eden/scm/lib/third-party/webview-sys/BUCK b/eden/scm/lib/third-party/webview-sys/BUCK
@@ -54,6 +54,7 @@ rust_library(
         "ovr_config//os:macos",
     ],
     doctests = False,
+    edition = "2021",
     os_deps = [
         (
             "macos",
@@ -100,5 +101,6 @@ rust_binary(
         "ovr_config//os:macos",
     ],
     crate_root = "examples/example.rs",
+    edition = "2021",
     deps = [":webview-sys"],
 )
diff --git a/eden/scm/lib/webview-app/BUCK b/eden/scm/lib/webview-app/BUCK
@@ -16,6 +16,7 @@ rust_library(
         },
     }},
     crate_root = "src/lib.rs",
+    edition = "2021",
     os_deps = [
         (
             "macos",
diff --git a/eden/scm/lib/xdiff-sys/src/bin/xdiff-sys-bin.rs b/eden/scm/lib/xdiff-sys/src/bin/xdiff-sys-bin.rs
@@ -22,7 +22,7 @@ use xdiff_sys::xdemitconf_t;
 use xdiff_sys::xdl_diff_vendored;
 use xdiff_sys::xpparam_t;
 
-extern "C" fn hunk_func(a1: i64, a2: i64, b1: i64, b2: i64, _priv: *mut c_void) -> c_int {
+unsafe extern "C" fn hunk_func(a1: i64, a2: i64, b1: i64, b2: i64, _priv: *mut c_void) -> c_int {
     println!("@@ -{},{} +{},{} @@", a1, a2, b1, b2);
     0
 }
diff --git a/eden/scm/lib/xdiff-sys/src/lib.rs b/eden/scm/lib/xdiff-sys/src/lib.rs
@@ -23,7 +23,13 @@ mod tests {
 
     #[test]
     fn test_xdl_diff_vendored() {
-        extern "C" fn hunk_func(a1: i64, a2: i64, b1: i64, b2: i64, _priv: *mut c_void) -> c_int {
+        unsafe extern "C" fn hunk_func(
+            a1: i64,
+            a2: i64,
+            b1: i64,
+            b2: i64,
+            _priv: *mut c_void,
+        ) -> c_int {
             let mut _priv = unsafe { (_priv as *mut Vec<(i64, i64, i64, i64)>).as_mut() };
             if let Some(result) = _priv {
                 result.push((a1, a2, b1, b2));
diff --git a/eden/scm/lib/xdiff/src/lib.rs b/eden/scm/lib/xdiff/src/lib.rs
@@ -68,7 +68,13 @@ pub fn diff_hunks<T>(old_text: T, new_text: T) -> Vec<Hunk>
 where
     T: AsRef<[u8]>,
 {
-    extern "C" fn hunk_consumer(a1: i64, a2: i64, b1: i64, b2: i64, _priv: *mut c_void) -> c_int {
+    unsafe extern "C" fn hunk_consumer(
+        a1: i64,
+        a2: i64,
+        b1: i64,
+        b2: i64,
+        _priv: *mut c_void,
+    ) -> c_int {
         let mut _priv = unsafe { (_priv as *mut Vec<Hunk>).as_mut() };
         let a1 = a1 as usize;
         let a2 = a2 as usize;
@@ -116,7 +122,13 @@ where
 /// Produce matching blocks, in (a1, a2, b1, b2) format.
 /// `a_lines[a1:a2]` matches `b_lines[b1:b2]`.
 pub fn blocks(a: &[u8], b: &[u8]) -> Vec<(u64, u64, u64, u64)> {
-    extern "C" fn hunk_consumer(a1: i64, a2: i64, b1: i64, b2: i64, blocks: *mut c_void) -> c_int {
+    unsafe extern "C" fn hunk_consumer(
+        a1: i64,
+        a2: i64,
+        b1: i64,
+        b2: i64,
+        blocks: *mut c_void,
+    ) -> c_int {
         let blocks = unsafe { (blocks as *mut Vec<(u64, u64, u64, u64)>).as_mut() };
         if let Some(blocks) = blocks {
             blocks.push((a1 as _, a2 as _, b1 as _, b2 as _));
diff --git a/eden/scm/saplingnative/bindings/modules/pyhgtime/src/lib.rs b/eden/scm/saplingnative/bindings/modules/pyhgtime/src/lib.rs
@@ -76,7 +76,7 @@ fn tzset() -> Option<i32> {
     {
         use std::os::raw::c_int;
         use std::os::raw::c_long;
-        extern "C" {
+        unsafe extern "C" {
             // See https://docs.microsoft.com/en-us/cpp/c-runtime-library/daylight-dstbias-timezone-and-tzname?view=vs-2019
             fn _tzset();
             fn _get_timezone(seconds: *mut c_long) -> c_int;
diff --git a/eden/scm/saplingnative/bindings/modules/pytracing/src/lib.rs b/eden/scm/saplingnative/bindings/modules/pytracing/src/lib.rs
@@ -510,7 +510,7 @@ fn impl_getsetattr<T: PythonTypeWithInner>(py: Python) {
     let type_object: PyType = T::type_object(py);
     let type_ptr: *mut ffi::PyTypeObject = type_object.as_type_ptr();
 
-    extern "C" fn getattr<T: PythonTypeWithInner>(
+    unsafe extern "C" fn getattr<T: PythonTypeWithInner>(
         this: *mut ffi::PyObject,
         name: *mut ffi::PyObject,
     ) -> *mut ffi::PyObject {
@@ -532,7 +532,7 @@ fn impl_getsetattr<T: PythonTypeWithInner>(py: Python) {
         }
     }
 
-    extern "C" fn setattr<T: PythonTypeWithInner>(
+    unsafe extern "C" fn setattr<T: PythonTypeWithInner>(
         this: *mut ffi::PyObject,
         name: *mut ffi::PyObject,
         value: *mut ffi::PyObject,
@@ -556,7 +556,7 @@ fn impl_getsetattr<T: PythonTypeWithInner>(py: Python) {
 
     // `__get__`, useful to bind `self` to a free function.
     // See https://docs.python.org/2/howto/descriptor.html.
-    extern "C" fn descr_get<T: PythonTypeWithInner>(
+    unsafe extern "C" fn descr_get<T: PythonTypeWithInner>(
         this: *mut ffi::PyObject,
         obj: *mut ffi::PyObject,
         typeobj: *mut ffi::PyObject,

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`
`8`	`8`	`#[cfg(feature = "buildinfo")]`
`9`	`9`	`#[link(name = "buildinfo", kind = "static")]`
`10`		`-extern "C" {`
	`10`	`+unsafe extern "C" {`
`11`	`11`	`pub fn print_buildinfo();`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*/`
`7`	`7`
`8`	`8`	`#[cfg(target_os = "macos")]`
`9`		`-extern "C" {`
	`9`	`+unsafe extern "C" {`
`10`	`10`	`fn darwin_ppid(pid: u32) -> u32;`
`11`	`11`	`fn darwin_exepath(pid: u32) -> *const libc::c_char;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ rust_library(`
`54`	`54`	`"ovr_config//os:macos",`
`55`	`55`	`],`
`56`	`56`	`doctests = False,`
	`57`	`+ edition = "2021",`
`57`	`58`	`os_deps = [`
`58`	`59`	`(`
`59`	`60`	`"macos",`
`@@ -100,5 +101,6 @@ rust_binary(`
`100`	`101`	`"ovr_config//os:macos",`
`101`	`102`	`],`
`102`	`103`	`crate_root = "examples/example.rs",`
	`104`	`+ edition = "2021",`
`103`	`105`	`deps = [":webview-sys"],`
`104`	`106`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ rust_library(`
`16`	`16`	`},`
`17`	`17`	`}},`
`18`	`18`	`crate_root = "src/lib.rs",`
	`19`	`+ edition = "2021",`
`19`	`20`	`os_deps = [`
`20`	`21`	`(`
`21`	`22`	`"macos",`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ use xdiff_sys::xdemitconf_t;`
`22`	`22`	`use xdiff_sys::xdl_diff_vendored;`
`23`	`23`	`use xdiff_sys::xpparam_t;`
`24`	`24`
`25`		`-extern "C" fn hunk_func(a1: i64, a2: i64, b1: i64, b2: i64, _priv: *mut c_void) -> c_int {`
	`25`	`+unsafe extern "C" fn hunk_func(a1: i64, a2: i64, b1: i64, b2: i64, _priv: *mut c_void) -> c_int {`
`26`	`26`	`println!("@@ -{},{} +{},{} @@", a1, a2, b1, b2);`
`27`	`27`	`0`
`28`	`28`	`}`