Skip to content

Commit 5edc8d6

Browse files
committed
cargo fmt
1 parent cf2a506 commit 5edc8d6

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

benches/my_benchmark.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
use criterion::{criterion_group, criterion_main, Criterion};
22
use foundation::{leak, no_leak};
33

4-
54
fn criterion_benchmark(c: &mut Criterion) {
65
let mut group = c.benchmark_group("to string");
76
let str = &"aaa 🍺".repeat(100);
8-
group.bench_with_input("old", str,|b, str| b.iter(|| leak(str)));
9-
group.bench_with_input("new", str,|b, str| b.iter(||no_leak(str)));
7+
group.bench_with_input("old", str, |b, str| b.iter(|| leak(str)));
8+
group.bench_with_input("new", str, |b, str| b.iter(|| no_leak(str)));
109
group.finish()
1110
}
1211

1312
criterion_group!(benches, criterion_benchmark);
14-
criterion_main!(benches);
13+
criterion_main!(benches);

src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use objc_foundation::{NSString, INSString};
21
use objc::{msg_send, sel, sel_impl};
3-
use std::ffi::{CString, c_void};
2+
use objc_foundation::{INSString, NSString};
43
use objc_id::Id;
4+
use std::ffi::{c_void, CString};
55
use std::os::raw::c_char;
66

77
pub fn leak(str: &str) {
@@ -14,7 +14,6 @@ pub fn no_leak(str: &str) {
1414
nsstring_to_rust_string(nsstrig);
1515
}
1616

17-
1817
/**
1918
Function that converts NSString to rust string through CString to prevent a memory leak.
2019
@@ -32,7 +31,8 @@ pub fn nsstring_to_rust_string(nsstring: Id<NSString>) -> String {
3231
let string_size: usize = msg_send![nsstring, lengthOfBytesUsingEncoding: 4];
3332
// + 1 is because getCString returns null terminated string
3433
let buffer = libc::malloc(string_size + 1) as *mut c_char;
35-
let is_success: bool = msg_send![nsstring, getCString:buffer maxLength:string_size+1 encoding:4];
34+
let is_success: bool =
35+
msg_send![nsstring, getCString:buffer maxLength:string_size+1 encoding:4];
3636
if is_success {
3737
// CString will take care of memory from now on
3838
CString::from_raw(buffer).to_str().unwrap().to_owned()
@@ -56,4 +56,4 @@ mod tests {
5656
let nsstrig = NSString::from_str("aaabbb🍺Ыض");
5757
assert_eq!(nsstring_to_rust_string(nsstrig), "aaabbb🍺Ыض");
5858
}
59-
}
59+
}

0 commit comments

Comments
 (0)