Migration to Edition 2024

native/src/core/build.rs

@@ -1,9 +1,9 @@
 use pb_rs::{types::FileDescriptor, ConfigBuilder};
 
-use crate::gen::gen_cxx_binding;
+use crate::codegen::gen_cxx_binding;
 
-#[path = "../include/gen.rs"]
-mod gen;
+#[path = "../include/codegen.rs"]
+mod codegen;
 
 fn main() {
     println!("cargo:rerun-if-changed=resetprop/proto/persistent_properties.proto");

native/src/core/db.rs

@@ -138,7 +138,7 @@ unsafe impl Send for Sqlite3 {}
 type SqlBindCallback = Option<unsafe extern "C" fn(*mut c_void, i32, Pin<&mut DbStatement>) -> i32>;
 type SqlExecCallback = Option<unsafe extern "C" fn(*mut c_void, &[String], &DbValues)>;
 
-extern "C" {
+unsafe extern "C" {
     fn sql_exec_impl(
         db: *mut sqlite3,
         sql: &str,
@@ -160,16 +160,18 @@ struct DbArgs<'a> {
 }
 
 unsafe extern "C" fn bind_arguments(v: *mut c_void, idx: i32, stmt: Pin<&mut DbStatement>) -> i32 {
-    let args = &mut *(v as *mut DbArgs<'_>);
-    if args.curr < args.args.len() {
-        let arg = &args.args[args.curr];
-        args.curr += 1;
-        match *arg {
-            Text(v) => stmt.bind_text(idx, v),
-            Integer(v) => stmt.bind_int64(idx, v),
+    unsafe {
+        let args = &mut *(v as *mut DbArgs<'_>);
+        if args.curr < args.args.len() {
+            let arg = &args.args[args.curr];
+            args.curr += 1;
+            match *arg {
+                Text(v) => stmt.bind_text(idx, v),
+                Integer(v) => stmt.bind_int64(idx, v),
+            }
+        } else {
+            0
         }
-    } else {
-        0
     }
 }
 
@@ -178,8 +180,10 @@ unsafe extern "C" fn read_db_row<T: SqlTable>(
     columns: &[String],
     values: &DbValues,
 ) {
-    let table = &mut *(v as *mut T);
-    table.on_row(columns, values);
+    unsafe {
+        let table = &mut *(v as *mut T);
+        table.on_row(columns, values);
+    }
 }
 
 impl MagiskD {
@@ -189,10 +193,9 @@ impl MagiskD {
             let raw_db = open_and_init_db();
             *db = NonNull::new(raw_db).map(Sqlite3);
         }
-        if let Some(ref mut db) = *db {
-            f(db.0.as_ptr())
-        } else {
-            -1
+        match *db {
+            Some(ref mut db) => f(db.0.as_ptr()),
+            _ => -1,
         }
     }
 
@@ -333,7 +336,7 @@ impl MagiskD {
     }
 }
 
-#[export_name = "sql_exec_rs"]
+#[unsafe(export_name = "sql_exec_rs")]
 unsafe extern "C" fn sql_exec_for_cxx(
     sql: &str,
     bind_callback: SqlBindCallback,
@@ -341,14 +344,16 @@ unsafe extern "C" fn sql_exec_for_cxx(
     exec_callback: SqlExecCallback,
     exec_cookie: *mut c_void,
 ) -> i32 {
-    MAGISKD.get().unwrap_unchecked().with_db(|db| {
-        sql_exec_impl(
-            db,
-            sql,
-            bind_callback,
-            bind_cookie,
-            exec_callback,
-            exec_cookie,
-        )
-    })
+    unsafe {
+        MAGISKD.get().unwrap_unchecked().with_db(|db| {
+            sql_exec_impl(
+                db,
+                sql,
+                bind_callback,
+                bind_cookie,
+                exec_callback,
+                exec_cookie,
+            )
+        })
+    }
 }

native/src/core/lib.rs

@@ -257,8 +257,10 @@ unsafe impl ExternType for UCred {
 
 impl SuRequest {
     unsafe fn write_to_fd(&self, fd: i32) {
-        let mut w = ManuallyDrop::new(File::from_raw_fd(fd));
-        self.encode(w.deref_mut()).ok();
+        unsafe {
+            let mut w = ManuallyDrop::new(File::from_raw_fd(fd));
+            self.encode(w.deref_mut()).ok();
+        }
     }
 }
 

native/src/core/logging.rs

@@ -42,7 +42,7 @@ enum ALogPriority {
 
 type ThreadEntry = extern "C" fn(*mut c_void) -> *mut c_void;
 
-extern "C" {
+unsafe extern "C" {
     fn __android_log_write(prio: i32, tag: *const c_char, msg: *const c_char);
     fn strftime(buf: *mut c_char, len: usize, fmt: *const c_char, tm: *const tm) -> usize;
     fn new_daemon_thread(entry: ThreadEntry, arg: *mut c_void);

native/src/core/package.rs

@@ -485,14 +485,16 @@ impl MagiskD {
     }
 
     pub unsafe fn get_manager_for_cxx(&self, user: i32, ptr: *mut CxxString, install: bool) -> i32 {
-        let mut info = self.manager_info.lock().unwrap();
-        let (uid, pkg) = info.get_manager(self, user, install);
-        if let Some(str) = ptr.as_mut() {
-            let mut str = Pin::new_unchecked(str);
-            str.as_mut().clear();
-            str.push_str(pkg);
+        unsafe {
+            let mut info = self.manager_info.lock().unwrap();
+            let (uid, pkg) = info.get_manager(self, user, install);
+            if let Some(str) = ptr.as_mut() {
+                let mut str = Pin::new_unchecked(str);
+                str.as_mut().clear();
+                str.push_str(pkg);
+            }
+            uid
         }
-        uid
     }
 
     // app_id = app_no + AID_APP_START

native/src/core/resetprop/persist.rs

@@ -130,8 +130,8 @@ pub fn persist_get_prop(name: &Utf8CStr, mut prop_cb: Pin<&mut PropCb>) {
             let mut props = proto_read_props()?;
             let prop = props.find(name)?;
             if let PersistentPropertyRecord {
-                name: Some(ref mut n),
-                value: Some(ref mut v),
+                name: Some(n),
+                value: Some(v),
             } = prop
             {
                 prop_cb.exec(Utf8CStr::from_string(n), Utf8CStr::from_string(v));
@@ -151,8 +151,8 @@ pub fn persist_get_props(mut prop_cb: Pin<&mut PropCb>) {
             let mut props = proto_read_props()?;
             props.iter_mut().for_each(|prop| {
                 if let PersistentPropertyRecord {
-                    name: Some(ref mut n),
-                    value: Some(ref mut v),
+                    name: Some(n),
+                    value: Some(v),
                 } = prop
                 {
                     prop_cb.exec(Utf8CStr::from_string(n), Utf8CStr::from_string(v));