Skip to content

Commit de23ba1

Browse files
nunoplopesnunoplopes
committed
edits
1 parent 8b25a00 commit de23ba1

7 files changed

Lines changed: 29 additions & 30 deletions

File tree

‎libcc2rs-macros/src/goto.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
use proc_macro::TokenStream;
55
use syn::parse::{Parse, ParseStream};
6-
use syn::{parse_macro_input, Expr, Lifetime, Token};
6+
use syn::{Expr, Lifetime, Token, parse_macro_input};
77

88
use crate::state_machine::{Arm, GotoStateMachine, StateMachine};
99

‎libcc2rs-macros/src/switch.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
use proc_macro::TokenStream;
55
use syn::parse::{Parse, ParseStream};
6-
use syn::{parse_macro_input, Expr, Pat};
6+
use syn::{Expr, Pat, parse_macro_input};
77

88
use crate::state_machine::{Arm, DispatchCase, GotoStateMachine, StateMachine, SwitchStateMachine};
99

‎libcc2rs/src/compat.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
use std::ffi::c_void;
55

6-
extern "C" {
6+
unsafe extern "C" {
77
#[cfg(target_os = "linux")]
88
#[link_name = "malloc_usable_size"]
99
fn platform_malloc_size(ptr: *mut c_void) -> usize;
@@ -21,10 +21,10 @@ extern "C" {
2121
pub unsafe fn malloc_usable_size(ptr: *mut c_void) -> usize {
2222
#[cfg(target_os = "linux")]
2323
{
24-
platform_malloc_size(ptr)
24+
unsafe { platform_malloc_size(ptr) }
2525
}
2626
#[cfg(target_os = "macos")]
2727
{
28-
platform_malloc_size(ptr as *const c_void)
28+
unsafe { platform_malloc_size(ptr as *const c_void) }
2929
}
3030
}

‎libcc2rs/src/dec.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl<T> UnsafePostfixDec for *const T {
7676
#[inline]
7777
unsafe fn postfix_dec(&mut self) -> Self {
7878
let copy = *self;
79-
*self = self.offset(-1);
79+
unsafe { *self = self.offset(-1) }
8080
copy
8181
}
8282
}
@@ -85,7 +85,7 @@ impl<T> UnsafePostfixDec for *mut T {
8585
#[inline]
8686
unsafe fn postfix_dec(&mut self) -> Self {
8787
let copy = *self;
88-
*self = self.offset(-1);
88+
unsafe { *self = self.offset(-1) }
8989
copy
9090
}
9191
}
@@ -100,15 +100,15 @@ pub trait UnsafePrefixDec {
100100
impl<T> UnsafePrefixDec for *const T {
101101
#[inline]
102102
unsafe fn prefix_dec(&mut self) -> Self {
103-
*self = self.offset(-1);
103+
unsafe { *self = self.offset(-1) }
104104
*self
105105
}
106106
}
107107

108108
impl<T> UnsafePrefixDec for *mut T {
109109
#[inline]
110110
unsafe fn prefix_dec(&mut self) -> Self {
111-
*self = self.offset(-1);
111+
unsafe { *self = self.offset(-1) }
112112
*self
113113
}
114114
}

‎libcc2rs/src/inc.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl<T> UnsafePostfixInc for *const T {
8787
#[inline]
8888
unsafe fn postfix_inc(&mut self) -> Self {
8989
let copy = *self;
90-
*self = self.offset(1);
90+
unsafe { *self = self.offset(1) }
9191
copy
9292
}
9393
}
@@ -96,7 +96,7 @@ impl<T> UnsafePostfixInc for *mut T {
9696
#[inline]
9797
unsafe fn postfix_inc(&mut self) -> Self {
9898
let copy = *self;
99-
*self = self.offset(1);
99+
unsafe { *self = self.offset(1) }
100100
copy
101101
}
102102
}
@@ -111,15 +111,15 @@ pub trait UnsafePrefixInc {
111111
impl<T> UnsafePrefixInc for *const T {
112112
#[inline]
113113
unsafe fn prefix_inc(&mut self) -> Self {
114-
*self = self.offset(1);
114+
unsafe { *self = self.offset(1) }
115115
*self
116116
}
117117
}
118118

119119
impl<T> UnsafePrefixInc for *mut T {
120120
#[inline]
121121
unsafe fn prefix_inc(&mut self) -> Self {
122-
*self = self.offset(1);
122+
unsafe { *self = self.offset(1) }
123123
*self
124124
}
125125
}

‎libcc2rs/src/rc.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ impl<T> fmt::Debug for PtrKind<T> {
7777
PtrKind::HeapSingle(w) => write!(f, "HeapSingle({:?})", w.as_ptr()),
7878
PtrKind::StackArray(w) => write!(f, "StackArray({:?})", w.as_ptr()),
7979
PtrKind::HeapArray(w) => write!(f, "HeapArray({:?})", w.as_ptr()),
80-
PtrKind::Reinterpreted(ref data) => {
80+
PtrKind::Reinterpreted(data) => {
8181
write!(f, "Reinterpreted(0x{:x})", data.address())
8282
}
8383
}
@@ -88,12 +88,12 @@ impl<T> Clone for PtrKind<T> {
8888
fn clone(&self) -> Self {
8989
match self {
9090
PtrKind::Null => PtrKind::Null,
91-
PtrKind::Vec(ref weak) => PtrKind::Vec(weak.clone()),
92-
PtrKind::StackSingle(ref weak) => PtrKind::StackSingle(weak.clone()),
93-
PtrKind::HeapSingle(ref weak) => PtrKind::HeapSingle(weak.clone()),
94-
PtrKind::StackArray(ref weak) => PtrKind::StackArray(weak.clone()),
95-
PtrKind::HeapArray(ref weak) => PtrKind::HeapArray(weak.clone()),
96-
PtrKind::Reinterpreted(ref data) => PtrKind::Reinterpreted(Rc::clone(data)),
91+
PtrKind::Vec(weak) => PtrKind::Vec(weak.clone()),
92+
PtrKind::StackSingle(weak) => PtrKind::StackSingle(weak.clone()),
93+
PtrKind::HeapSingle(weak) => PtrKind::HeapSingle(weak.clone()),
94+
PtrKind::StackArray(weak) => PtrKind::StackArray(weak.clone()),
95+
PtrKind::HeapArray(weak) => PtrKind::HeapArray(weak.clone()),
96+
PtrKind::Reinterpreted(data) => PtrKind::Reinterpreted(Rc::clone(data)),
9797
}
9898
}
9999
}
@@ -105,7 +105,7 @@ impl<T> PtrKind<T> {
105105
PtrKind::StackSingle(w) | PtrKind::HeapSingle(w) => w.as_ptr() as usize,
106106
PtrKind::Vec(w) => w.as_ptr() as usize,
107107
PtrKind::StackArray(w) | PtrKind::HeapArray(w) => w.as_ptr() as usize,
108-
PtrKind::Reinterpreted(ref data) => data.address(),
108+
PtrKind::Reinterpreted(data) => data.address(),
109109
}
110110
}
111111
}
@@ -346,7 +346,7 @@ impl<T> Ptr<T> {
346346
rc: weak.upgrade().expect("ub: dangling pointer"),
347347
offset: self.offset,
348348
},
349-
PtrKind::Reinterpreted(ref data) => StrongPtr::Reinterpreted {
349+
PtrKind::Reinterpreted(data) => StrongPtr::Reinterpreted {
350350
alloc: Rc::clone(data),
351351
byte_offset: self.offset,
352352
cell: RefCell::new(None),
@@ -416,7 +416,7 @@ impl<T> Ptr<T> {
416416
Rc::new(SliceOriginalAlloc { weak: weak.clone() }),
417417
self.byte_offset(),
418418
),
419-
PtrKind::Reinterpreted(ref data) => (Rc::clone(data), self.offset),
419+
PtrKind::Reinterpreted(data) => (Rc::clone(data), self.offset),
420420
};
421421

422422
Ptr {
@@ -879,7 +879,7 @@ impl<T> fmt::Debug for Ptr<T> {
879879
.wrapping_add(self.offset.wrapping_mul(std::mem::size_of::<T>())),
880880
PtrKind::Vec(w) => (Weak::as_ptr(w) as usize)
881881
.wrapping_add(self.offset.wrapping_mul(std::mem::size_of::<T>())),
882-
PtrKind::Reinterpreted(ref data) => data.address().wrapping_add(self.offset),
882+
PtrKind::Reinterpreted(data) => data.address().wrapping_add(self.offset),
883883
};
884884
write!(f, "0x{:x}", addr)
885885
}
@@ -1191,7 +1191,7 @@ impl<T: ?Sized> PtrDyn<T> {
11911191
pub fn upgrade(&self) -> StrongPtrDyn<T> {
11921192
match &self.kind {
11931193
PtrKindDyn::Null => panic!("ub: dereference of null pointer"),
1194-
PtrKindDyn::StackSingle(ref weak) => {
1194+
PtrKindDyn::StackSingle(weak) => {
11951195
assert_eq!(self.offset, 0, "ub: invalid offset");
11961196
StrongPtrDyn {
11971197
rc: weak.upgrade().expect("ub: dangling pointer"),

‎tests/lit/lit/formats/Cpp2RustTest.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def build_rust(self):
221221
"--extern",
222222
f"libcc2rs={cc2rs_dir / 'liblibcc2rs.rlib'}",
223223
"--extern",
224-
f"libc={libc_rlib}"
224+
f"libc={libc_rlib}",
225225
]
226226
_, err, returncode = lit.util.executeCommand(cmd, str(self.tmp_dir))
227227
if exp.should_not_compile:
@@ -248,10 +248,9 @@ def run_rust(self):
248248

249249
if exp.should_panic:
250250
err = str(self.rust_result.stderr)
251-
if (
252-
not re.search(r"thread 'main' \(\d+\) panicked at", err)
253-
or self.rust_result.returncode not in [-6, 101]
254-
):
251+
if not re.search(
252+
r"thread 'main' \(\d+\) panicked at", err
253+
) or self.rust_result.returncode not in [-6, 101]:
255254
return (exp.fail_code, "expected panic\n" + err)
256255
return self.success_result()
257256

0 commit comments

Comments
 (0)