Skip to content

Commit 8da8704

Browse files
author
Thom Chiovoloni
committed
Appease clippy
1 parent de2fd5d commit 8da8704

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

libmimalloc-sys/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![allow(clippy::collapsible_if)]
12
use cmake::Config;
23
use std::env;
34

src/lib.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@ unsafe impl GlobalAlloc for MiMalloc {
6767
if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
6868
mi_malloc(layout.size()) as *mut u8
6969
} else {
70-
if cfg!(target_os = "macos") {
71-
if layout.align() > (1 << 31) {
72-
return core::ptr::null_mut();
73-
}
70+
if cfg!(target_os = "macos") && layout.align() > (1 << 31) {
71+
return core::ptr::null_mut();
7472
}
7573

7674
mi_malloc_aligned(layout.size(), layout.align()) as *mut u8
@@ -82,10 +80,8 @@ unsafe impl GlobalAlloc for MiMalloc {
8280
if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
8381
mi_zalloc(layout.size()) as *mut u8
8482
} else {
85-
if cfg!(target_os = "macos") {
86-
if layout.align() > (1 << 31) {
87-
return core::ptr::null_mut();
88-
}
83+
if cfg!(target_os = "macos") && layout.align() > (1 << 31) {
84+
return core::ptr::null_mut();
8985
}
9086

9187
mi_zalloc_aligned(layout.size(), layout.align()) as *mut u8
@@ -117,7 +113,7 @@ mod tests {
117113
let layout = Layout::from_size_align(8, 8).unwrap();
118114
let alloc = MiMalloc;
119115

120-
let ptr = alloc.alloc(layout.clone());
116+
let ptr = alloc.alloc(layout);
121117
alloc.dealloc(ptr, layout);
122118
}
123119
}
@@ -128,7 +124,7 @@ mod tests {
128124
let layout = Layout::from_size_align(8, 8).unwrap();
129125
let alloc = MiMalloc;
130126

131-
let ptr = alloc.alloc_zeroed(layout.clone());
127+
let ptr = alloc.alloc_zeroed(layout);
132128
alloc.dealloc(ptr, layout);
133129
}
134130
}
@@ -139,8 +135,8 @@ mod tests {
139135
let layout = Layout::from_size_align(8, 8).unwrap();
140136
let alloc = MiMalloc;
141137

142-
let ptr = alloc.alloc(layout.clone());
143-
let ptr = alloc.realloc(ptr, layout.clone(), 16);
138+
let ptr = alloc.alloc(layout);
139+
let ptr = alloc.realloc(ptr, layout, 16);
144140
alloc.dealloc(ptr, layout);
145141
}
146142
}

0 commit comments

Comments
 (0)