Skip to content

Commit b4b2c18

Browse files
committed
Revert accidental push directly to master
This reverts commit 89061c3. Why am I even able to push to master?
1 parent 89061c3 commit b4b2c18

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

src/bytes.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,25 +1104,14 @@ unsafe fn release_shared(ptr: *mut Shared) {
11041104
Box::from_raw(ptr);
11051105
}
11061106

1107-
#[cfg(miri)]
11081107
fn ptr_map<F>(ptr: *mut u8, f: F) -> *mut u8
11091108
where
11101109
F: FnOnce(usize) -> usize,
11111110
{
11121111
let old_addr = ptr as usize;
11131112
let new_addr = f(old_addr);
1114-
let diff = new_addr.wrapping_sub(old_addr);
1115-
ptr.wrapping_add(diff)
1116-
}
1117-
1118-
#[cfg(not(miri))]
1119-
fn ptr_map<F>(ptr: *mut u8, f: F) -> *mut u8
1120-
where
1121-
F: FnOnce(usize) -> usize,
1122-
{
1123-
let old_addr = ptr as usize;
1124-
let new_addr = f(old_addr);
1125-
new_addr as *mut u8
1113+
// this optimizes better than `ptr.wrapping_add(new_addr.wrapping_sub(old_addr))`
1114+
ptr.wrapping_sub(old_addr).wrapping_add(new_addr)
11261115
}
11271116

11281117
// compile-fails

0 commit comments

Comments
 (0)