Skip to content

Commit 69dcba3

Browse files
lucic71lucic71
committed
Delete unnecessary clones from rules
1 parent 7b5abef commit 69dcba3

63 files changed

Lines changed: 258 additions & 285 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎rules/algorithm/tgt_refcount.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn f2<T1: Clone + PartialOrd + ByteRepr, T2: Clone + From<T1> + ByteRepr>(
1616
a2: Ptr<T2>,
1717
) -> Ptr<T2> {
1818
let count = a1.get_offset() - a0.get_offset();
19-
let mut outptr = a2.clone();
19+
let mut outptr = a2;
2020
for value in PtrValueIter::new(&a0, count) {
2121
outptr.write(value.into());
2222
outptr += 1;
@@ -75,8 +75,8 @@ fn f10<T1: PartialEq + Clone + ByteRepr>(a0: Ptr<T1>, a1: Ptr<T1>) -> Ptr<T1> {
7575
if count <= 1 {
7676
a1
7777
} else {
78-
let mut write_ptr = a0.clone();
7978
let mut iter = PtrValueIter::new(&a0, count);
79+
let mut write_ptr = a0;
8080
let mut last_unique = iter.next().unwrap();
8181

8282
// the first unique value is already in place
@@ -94,7 +94,7 @@ fn f10<T1: PartialEq + Clone + ByteRepr>(a0: Ptr<T1>, a1: Ptr<T1>) -> Ptr<T1> {
9494
}
9595

9696
fn f12<T1: Clone + ByteRepr>(a0: Ptr<T1>, a1: Ptr<T1>, a2: T1) {
97-
let mut __a0 = a0.clone();
97+
let mut __a0 = a0;
9898
while __a0 != a1 {
9999
let v = a2.clone();
100100
__a0.write(v);

‎rules/arpa_inet/tgt_refcount.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fn f6(a0: i32, a1: AnyPtr, a2: Ptr<u8>, a3: u32) -> Ptr<u8> {
4949
__sl[..__n].copy_from_slice(__s.as_bytes());
5050
__sl[__n] = 0;
5151
});
52-
a2.clone()
52+
a2
5353
}
5454
Some(_) => {
5555
libcc2rs::cpp2rust_errno().write(::libc::ENOSPC);

‎rules/array/tgt_refcount.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ fn f5<T1: ByteRepr + Clone>(a0: Ptr<Vec<T1>>, a1: &mut Vec<T1>) {
1818
}
1919

2020
fn f7<T1: Clone + ByteRepr>(a0: Ptr<Vec<T1>>, a1: Vec<T1>) {
21-
a0.write(a1.clone())
21+
a0.write(a1)
2222
}

‎rules/builtin/tgt_refcount.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ fn f13(a0: i64, a1: i64, a2: Ptr<i64>) -> bool {
2626

2727
fn f14(a0: AnyPtr, a1: AnyPtr, a2: usize) -> AnyPtr {
2828
a0.memcpy(&a1, a2 as usize);
29-
a0.clone()
29+
a0
3030
}

‎rules/cstdlib/tgt_refcount.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fn f6(a0: Ptr<u8>) -> Ptr<u8> {
3131
}
3232

3333
fn f10(a0: Ptr<u8>, a1: Ptr<u8>) -> Ptr<u8> {
34-
let __resolved = a1.clone();
34+
let __resolved = a1;
3535
match ::std::fs::canonicalize(a0.to_rust_string()) {
3636
Ok(__p) => {
3737
let mut __bytes = __p.into_os_string().into_encoded_bytes();

‎rules/cstring/tgt_refcount.rs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ use libcc2rs::*;
55

66
fn f1(a0: AnyPtr, a1: AnyPtr, a2: usize) -> AnyPtr {
77
a0.memcpy(&a1, a2 as usize);
8-
a0.clone()
8+
a0
99
}
1010

1111
fn f2(a0: AnyPtr, a1: u8, a2: usize) -> AnyPtr {
1212
a0.memset((a1) as u8, a2 as usize);
13-
a0.clone()
13+
a0
1414
}
1515

1616
fn f3(a0: AnyPtr, a1: AnyPtr, a2: usize) -> i32 {
@@ -19,11 +19,11 @@ fn f3(a0: AnyPtr, a1: AnyPtr, a2: usize) -> i32 {
1919

2020
fn f4(a0: AnyPtr, a1: AnyPtr, a2: usize) -> AnyPtr {
2121
a0.memcpy(&a1, a2 as usize);
22-
a0.clone()
22+
a0
2323
}
2424

2525
fn f5(a0: Ptr<u8>, a1: i32) -> Ptr<u8> {
26-
let __s = a0.clone();
26+
let __s = a0;
2727
let __t = a1 as u8;
2828
match __s.to_c_string_iterator().position(|__c| __c == __t) {
2929
Some(__i) => __s.offset(__i),
@@ -88,7 +88,7 @@ fn f10(a0: AnyPtr, a1: i32, a2: usize) -> AnyPtr {
8888
}
8989

9090
fn f11(a0: Ptr<u8>, a1: i32) -> Ptr<u8> {
91-
let __s = a0.clone();
91+
let __s = a0;
9292
let __t = a1 as u8;
9393
match __s
9494
.to_c_string_iterator()
@@ -108,26 +108,26 @@ fn f11(a0: Ptr<u8>, a1: i32) -> Ptr<u8> {
108108
}
109109

110110
fn f15(a0: Ptr<u8>) -> Ptr<u8> {
111-
libcc2rs::strdup_refcount(a0.clone())
111+
libcc2rs::strdup_refcount(a0)
112112
}
113113

114114
fn f16(a0: Ptr<u8>, a1: Ptr<u8>) -> usize {
115-
let __set = a1.clone();
115+
let __set = a1;
116116
a0.to_c_string_iterator()
117117
.take_while(|__c| !__set.to_c_string_iterator().any(|__r| __r == *__c))
118118
.count()
119119
}
120120

121121
fn f17(a0: Ptr<u8>, a1: Ptr<u8>) -> usize {
122-
let __set = a1.clone();
122+
let __set = a1;
123123
a0.to_c_string_iterator()
124124
.take_while(|__c| __set.to_c_string_iterator().any(|__r| __r == *__c))
125125
.count()
126126
}
127127

128128
fn f18(a0: Ptr<u8>, a1: Ptr<u8>) -> Ptr<u8> {
129-
let __needle = a1.clone();
130-
let mut __p = a0.clone();
129+
let __needle = a1;
130+
let mut __p = a0;
131131
loop {
132132
let mut __h = __p.to_c_string_iterator();
133133
if __needle
@@ -144,8 +144,8 @@ fn f18(a0: Ptr<u8>, a1: Ptr<u8>) -> Ptr<u8> {
144144
}
145145

146146
fn f21(a0: Ptr<u8>, a1: Ptr<u8>) -> Ptr<u8> {
147-
let __s = a0.clone();
148-
let __set = a1.clone();
147+
let __s = a0;
148+
let __set = a1;
149149
match __s
150150
.to_c_string_iterator()
151151
.position(|__c| __set.to_c_string_iterator().any(|__r| __r == __c))
@@ -221,7 +221,7 @@ fn f28(a0: i32, a1: Ptr<u8>, a2: usize) -> i32 {
221221
}
222222

223223
fn f6(a0: Ptr<u8>, a1: i32) -> Ptr<u8> {
224-
let __s = a0.clone();
224+
let __s = a0;
225225
let __t = a1 as u8;
226226
match __s.to_c_string_iterator().position(|__c| __c == __t) {
227227
Some(__i) => __s.offset(__i),
@@ -251,7 +251,7 @@ fn f12(a0: AnyPtr, a1: i32, a2: usize) -> AnyPtr {
251251
}
252252

253253
fn f13(a0: Ptr<u8>, a1: i32) -> Ptr<u8> {
254-
let __s = a0.clone();
254+
let __s = a0;
255255
let __t = a1 as u8;
256256
match __s
257257
.to_c_string_iterator()
@@ -271,7 +271,7 @@ fn f13(a0: Ptr<u8>, a1: i32) -> Ptr<u8> {
271271
}
272272

273273
fn f14(a0: Ptr<u8>, a1: i32) -> Ptr<u8> {
274-
let __s = a0.clone();
274+
let __s = a0;
275275
let __t = a1 as u8;
276276
match __s
277277
.to_c_string_iterator()
@@ -291,8 +291,8 @@ fn f14(a0: Ptr<u8>, a1: i32) -> Ptr<u8> {
291291
}
292292

293293
fn f19(a0: Ptr<u8>, a1: Ptr<u8>) -> Ptr<u8> {
294-
let __needle = a1.clone();
295-
let mut __p = a0.clone();
294+
let __needle = a1;
295+
let mut __p = a0;
296296
loop {
297297
let mut __h = __p.to_c_string_iterator();
298298
if __needle
@@ -309,8 +309,8 @@ fn f19(a0: Ptr<u8>, a1: Ptr<u8>) -> Ptr<u8> {
309309
}
310310

311311
fn f20(a0: Ptr<u8>, a1: Ptr<u8>) -> Ptr<u8> {
312-
let __needle = a1.clone();
313-
let mut __p = a0.clone();
312+
let __needle = a1;
313+
let mut __p = a0;
314314
loop {
315315
let mut __h = __p.to_c_string_iterator();
316316
if __needle
@@ -327,8 +327,8 @@ fn f20(a0: Ptr<u8>, a1: Ptr<u8>) -> Ptr<u8> {
327327
}
328328

329329
fn f22(a0: Ptr<u8>, a1: Ptr<u8>) -> Ptr<u8> {
330-
let __s = a0.clone();
331-
let __set = a1.clone();
330+
let __s = a0;
331+
let __set = a1;
332332
match __s
333333
.to_c_string_iterator()
334334
.position(|__c| __set.to_c_string_iterator().any(|__r| __r == __c))
@@ -339,8 +339,8 @@ fn f22(a0: Ptr<u8>, a1: Ptr<u8>) -> Ptr<u8> {
339339
}
340340

341341
fn f23(a0: Ptr<u8>, a1: Ptr<u8>) -> Ptr<u8> {
342-
let __s = a0.clone();
343-
let __set = a1.clone();
342+
let __s = a0;
343+
let __set = a1;
344344
match __s
345345
.to_c_string_iterator()
346346
.position(|__c| __set.to_c_string_iterator().any(|__r| __r == __c))

‎rules/deque/tgt_refcount.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fn f7<T1: ByteRepr>(a0: Ptr<Vec<Value<Vec<T1>>>>, a1: Value<Vec<T1>>) {
1818
}
1919

2020
fn f10<T1: Clone + ByteRepr>(a0: Ptr<Vec<T1>>, a1: Vec<T1>) {
21-
a0.write(a1.clone())
21+
a0.write(a1)
2222
}
2323

2424
fn f11<T1: ByteRepr + Clone>(a0: Ptr<Vec<T1>>, a1: &mut Vec<T1>) {

‎rules/functional/tgt_refcount.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ fn f1<T1>(a0: Ptr<T1>) -> Ptr<T1> {
1212
}
1313

1414
fn f2<T1>(a0: Ptr<T1>) -> Ptr<T1> {
15-
a0.clone()
15+
a0
1616
}
1717

1818
fn f3<T1>(a0: Ptr<T1>) -> Ptr<T1> {
19-
a0.clone()
19+
a0
2020
}

‎rules/ifaddrs/tgt_refcount.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fn t1() -> libcc2rs::Ifaddrs {
88
}
99

1010
fn f1(a0: Ptr<Ptr<Ifaddrs>>) -> i32 {
11-
let __out = a0.clone();
11+
let __out = a0;
1212
match nix::ifaddrs::getifaddrs() {
1313
Ok(__ifas) => {
1414
let __list: Vec<nix::ifaddrs::InterfaceAddress> = __ifas.collect();
@@ -29,7 +29,7 @@ fn f1(a0: Ptr<Ptr<Ifaddrs>>) -> i32 {
2929
}
3030

3131
fn f2(a0: Ptr<Ifaddrs>) {
32-
let mut __cur = a0.clone();
32+
let mut __cur = a0;
3333
while !__cur.is_null() {
3434
let __next = __cur.with(|__i| {
3535
let __name = __i.ifa_name.borrow();

‎rules/map/tgt_refcount.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fn f1<T1: Ord + Clone + ByteRepr + 'static, T2: Default + ByteRepr + 'static>(
2323
a1: T1,
2424
) -> Ptr<T2> {
2525
a0.with_mut(|__v: &mut BTreeMap<T1, Value<T2>>| {
26-
__v.entry(a1.clone())
26+
__v.entry(a1)
2727
.or_insert_with(|| Rc::new(RefCell::new(<T2>::default())))
2828
.as_pointer()
2929
})
@@ -59,7 +59,7 @@ fn f8<T1: Ord + Clone + ByteRepr + 'static, T2: Default + ByteRepr + 'static>(
5959
a1: T1,
6060
) -> Ptr<T2> {
6161
a0.with_mut(|__v: &mut BTreeMap<T1, Value<T2>>| {
62-
__v.entry(a1.clone())
62+
__v.entry(a1)
6363
.or_insert_with(|| Rc::new(RefCell::new(<T2>::default())))
6464
.as_pointer()
6565
})
@@ -123,7 +123,7 @@ fn f17<T1: Ord + Clone + 'static, T2: 'static>(
123123
}
124124

125125
fn f19<T1: Clone, T2>(a0: RefcountMapIter<T1, T2>) -> RefcountMapIter<T1, T2> {
126-
a0.clone()
126+
a0
127127
}
128128

129129
fn f20<T1: Ord + Clone + 'static, T2: 'static>(a0: RefcountMapIter<T1, T2>) -> Value<T1> {

0 commit comments

Comments
 (0)