Replace offset(1) pointer increments with += 1

Agent-Logs-Url: https://github.com/Cpp2Rust/cpp2rust/sessions/4292d6f5-f28a-4fb3-9f45-3a67ee6f91c7

Co-authored-by: nunoplopes <2998477+nunoplopes@users.noreply.github.com>

Author: Copilot

libcc2rs/src/inc.rs

@@ -87,7 +87,7 @@ impl<T> UnsafePostfixInc for *const T {
     #[inline]
     unsafe fn postfix_inc(&mut self) -> Self {
         let copy = *self;
-        *self = self.offset(1);
+        *self += 1;
         copy
     }
 }
@@ -96,7 +96,7 @@ impl<T> UnsafePostfixInc for *mut T {
     #[inline]
     unsafe fn postfix_inc(&mut self) -> Self {
         let copy = *self;
-        *self = self.offset(1);
+        *self += 1;
         copy
     }
 }
@@ -111,15 +111,15 @@ pub trait UnsafePrefixInc {
 impl<T> UnsafePrefixInc for *const T {
     #[inline]
     unsafe fn prefix_inc(&mut self) -> Self {
-        *self = self.offset(1);
+        *self += 1;
         *self
     }
 }
 
 impl<T> UnsafePrefixInc for *mut T {
     #[inline]
     unsafe fn prefix_inc(&mut self) -> Self {
-        *self = self.offset(1);
+        *self += 1;
         *self
     }
 }

libcc2rs/src/io.rs

@@ -112,7 +112,7 @@ pub fn fread_refcount(a0: AnyPtr, a1: u64, a2: u64, a3: Ptr<::std::fs::File>) ->
 
         for &byte in &buffer[..n] {
             dst.write(byte);
-            dst = dst.offset(1);
+            dst += 1;
         }
 
         read_bytes += n;
@@ -154,7 +154,7 @@ pub unsafe fn fread_unsafe(
         for &byte in &buffer[..n] {
             unsafe {
                 *dst = byte;
-                dst = dst.offset(1);
+                dst += 1;
             }
         }
 

libcc2rs/src/rc.rs

@@ -641,7 +641,7 @@ impl<T> Iterator for StringIterator<T> {
         // skip the null terminator
         if self.ptr.get_offset() + 1 < self.ptr.len() {
             let value = self.ptr.clone();
-            self.ptr = self.ptr.offset(1);
+            self.ptr += 1;
             Some(value)
         } else {
             None

rules/algorithm/tgt_unsafe.rs

@@ -13,8 +13,8 @@ unsafe fn f2<T1: Clone, T2: From<T1>>(a0: *const T1, a1: *const T1, a2: *mut T2)
     let mut curr = a0.clone();
     while curr < a1 {
         *outptr = (*curr).clone().into();
-        curr = curr.offset(1);
-        outptr = outptr.offset(1);
+        curr += 1;
+        outptr += 1;
     }
     outptr
 }

rules/stdio/tgt_refcount.rs

@@ -80,7 +80,7 @@ fn f6(a0: AnyPtr, a1: u64, a2: u64, a3: Ptr<::std::fs::File>) -> u64 {
 
         for i in 0..to_fill {
             buffer[i] = src.read();
-            src = src.offset(1);
+            src += 1;
         }
 
         let mut off = 0;

rules/stdio/tgt_unsafe.rs

@@ -85,7 +85,7 @@ unsafe fn f6(a0: *const ::libc::c_void, a1: u64, a2: u64, a3: *mut ::std::fs::Fi
 
         for i in 0..to_fill {
             buffer[i] = *src;
-            src = src.offset(1);
+            src += 1;
         }
 
         let mut off = 0;