Skip to content

Commit eeb99bd

Browse files
lucic71lucic71
committed
vec_ptr -> ptr
1 parent dae0e6a commit eeb99bd

11 files changed

Lines changed: 40 additions & 40 deletions

‎rules/iterator_category/shim.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ macro_rules! random_access_iterator {
339339
}
340340

341341
impl<T> $name<T> {
342-
pub fn vec_ptr(&self) -> $ptr {
342+
pub fn ptr(&self) -> $ptr {
343343
match self {
344344
Self::Vec(p) => p.clone(),
345345
}
@@ -354,7 +354,7 @@ macro_rules! random_access_iterator {
354354

355355
impl<T> Clone for $name<T> {
356356
fn clone(&self) -> Self {
357-
Self::Vec(self.vec_ptr())
357+
Self::Vec(self.ptr())
358358
}
359359
}
360360

‎rules/vector/tgt_refcount.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn f40<T1>(a0: Ptr<T1>) -> Ptr<T1> {
1010
}
1111

1212
fn f60<T1: ByteRepr>(a0: Ptr<Vec<T1>>, a1: RandomAccessIterator<T1>) -> RandomAccessIterator<T1> {
13-
let idx = a1.vec_ptr().get_offset();
13+
let idx = a1.ptr().get_offset();
1414
a0.with_mut(|__v: &mut Vec<T1>| __v.remove(idx));
1515
RandomAccessIterator::Vec(a0.decay())
1616
}
@@ -40,13 +40,13 @@ fn f76<T1>(a0: Ptr<T1>) -> RandomAccessIterator<T1> {
4040
}
4141

4242
fn f77<T1: ByteRepr>(a0: &mut Vec<T1>, a1: RandomAccessIterator<T1>, a2: T1) -> RandomAccessIterator<T1> {
43-
let __off = a1.vec_ptr().get_offset();
43+
let __off = a1.ptr().get_offset();
4444
a0.insert(__off, a2);
4545
a1
4646
}
4747

4848
fn f79<T1: ByteRepr>(a0: &mut Vec<T1>, a1: RandomAccessIterator<T1>, a2: T1) -> RandomAccessIterator<T1> {
49-
let __off = a1.vec_ptr().get_offset();
49+
let __off = a1.ptr().get_offset();
5050
a0.insert(__off, a2);
5151
a1
5252
}
@@ -91,7 +91,7 @@ fn f101<T1: Clone + ByteRepr, T2, T3: CppInputIterator<T1>>(
9191
a2: T3,
9292
a3: T3,
9393
) -> RandomAccessIterator<T1> {
94-
let start_idx = a1.vec_ptr().get_offset();
94+
let start_idx = a1.ptr().get_offset();
9595
let mut temp_vec: Vec<T1> = Vec::new();
9696
let mut __it = a2;
9797
while __it != a3 {
@@ -117,13 +117,13 @@ fn f105<T1: Clone + ByteRepr>(a0: Ptr<Vec<T1>>, a1: Vec<T1>) {
117117
}
118118

119119
fn f115<T1: Clone + ByteRepr>(a0: &mut Vec<T1>, a1: RandomAccessIterator<T1>, a2: usize, a3: T1) -> RandomAccessIterator<T1> {
120-
let __off = a1.vec_ptr().get_offset();
120+
let __off = a1.ptr().get_offset();
121121
a0.splice(__off..__off, std::iter::repeat_n(a3, a2));
122122
a1
123123
}
124124

125125
fn f116<T1: ByteRepr>(a0: &mut Vec<T1>, a1: RandomAccessIterator<T1>, a2: Vec<T1>) -> RandomAccessIterator<T1> {
126-
let __off = a1.vec_ptr().get_offset();
126+
let __off = a1.ptr().get_offset();
127127
a0.splice(__off..__off, a2);
128128
a1
129129
}

‎rules/vector/tgt_unsafe.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ unsafe fn f47(a0: Vec<bool>) -> Vec<bool> {
2424
}
2525

2626
unsafe fn f60<T1>(a0: &mut Vec<T1>, a1: UnsafeRandomAccessIterator<T1>) -> UnsafeRandomAccessIterator<T1> {
27-
let pos = a1.vec_ptr().offset_from(a0.as_ptr()) as usize;
27+
let pos = a1.ptr().offset_from(a0.as_ptr()) as usize;
2828
a0.remove(pos);
2929
a1
3030
}
@@ -101,7 +101,7 @@ unsafe fn f76<T1>(a0: &mut Vec<T1>) -> UnsafeRandomAccessIterator<T1> {
101101
}
102102

103103
unsafe fn f77<T1>(a0: &mut Vec<T1>, a1: UnsafeRandomAccessIterator<T1>, a2: T1) -> UnsafeRandomAccessIterator<T1> {
104-
let pos = a1.vec_ptr().offset_from(a0.as_ptr()) as usize;
104+
let pos = a1.ptr().offset_from(a0.as_ptr()) as usize;
105105
a0.insert(pos, a2);
106106
a1
107107
}
@@ -111,7 +111,7 @@ unsafe fn f78<T1: Default + Clone>(a0: usize, a1: T1) -> Vec<T1> {
111111
}
112112

113113
unsafe fn f79<T1>(a0: &mut Vec<T1>, a1: UnsafeRandomAccessIterator<T1>, a2: T1) -> UnsafeRandomAccessIterator<T1> {
114-
let pos = a1.vec_ptr().offset_from(a0.as_ptr()) as usize;
114+
let pos = a1.ptr().offset_from(a0.as_ptr()) as usize;
115115
a0.insert(pos, a2);
116116
a1
117117
}
@@ -169,7 +169,7 @@ unsafe fn f101<T1: Clone, T2, T3: UnsafeCppInputIterator<T1>>(
169169
a2: T3,
170170
a3: T3,
171171
) -> UnsafeRandomAccessIterator<T1> {
172-
let __off = a1.vec_ptr().offset_from(a0.as_ptr()) as usize;
172+
let __off = a1.ptr().offset_from(a0.as_ptr()) as usize;
173173
let mut __tmp = Vec::new();
174174
let mut __it = a2;
175175
while __it != a3 {
@@ -215,13 +215,13 @@ unsafe fn f114<T1>(a0: &mut Vec<T1>, init: T1) {
215215
}
216216

217217
unsafe fn f115<T1: Clone>(a0: &mut Vec<T1>, a1: UnsafeRandomAccessIterator<T1>, a2: usize, a3: T1) -> UnsafeRandomAccessIterator<T1> {
218-
let __off = a1.vec_ptr().offset_from(a0.as_ptr()) as usize;
218+
let __off = a1.ptr().offset_from(a0.as_ptr()) as usize;
219219
a0.splice(__off..__off, std::iter::repeat_n(a3, a2));
220220
UnsafeRandomAccessIterator::Vec(a0.as_mut_ptr().add(__off))
221221
}
222222

223223
unsafe fn f116<T1>(a0: &mut Vec<T1>, a1: UnsafeRandomAccessIterator<T1>, a2: Vec<T1>) -> UnsafeRandomAccessIterator<T1> {
224-
let __off = a1.vec_ptr().offset_from(a0.as_ptr()) as usize;
224+
let __off = a1.ptr().offset_from(a0.as_ptr()) as usize;
225225
a0.splice(__off..__off, a2);
226226
UnsafeRandomAccessIterator::Vec(a0.as_mut_ptr().add(__off))
227227
}

‎tests/unit/out/refcount/unboxed_conditional_iterator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pub fn lehmer_2(mut sigma: Ptr<u32>, mut len: u32, mut code: Ptr<u32>) {
6767
elem!(code, i).write(__rhs);
6868
{
6969
let idx = <RandomAccessIterator<u32>>::from((*it.borrow()).clone())
70-
.vec_ptr()
70+
.ptr()
7171
.get_offset();
7272
(items.as_pointer() as Ptr<Vec<u32>>).with_mut(|__v: &mut Vec<u32>| __v.remove(idx));
7373
RandomAccessIterator::Vec((items.as_pointer() as Ptr<Vec<u32>>).decay())

‎tests/unit/out/refcount/vector.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fn main_0() -> i32 {
5858
let idx = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
5959
(v2.as_pointer() as Ptr<i32>),
6060
))
61-
.vec_ptr()
61+
.ptr()
6262
.get_offset();
6363
(v2.as_pointer() as Ptr<Vec<i32>>).with_mut(|__v: &mut Vec<i32>| __v.remove(idx));
6464
RandomAccessIterator::Vec((v2.as_pointer() as Ptr<Vec<i32>>).decay())
@@ -70,7 +70,7 @@ fn main_0() -> i32 {
7070
let __off = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
7171
(v2.as_pointer() as Ptr<i32>),
7272
))
73-
.vec_ptr()
73+
.ptr()
7474
.get_offset();
7575
(*v2.borrow_mut()).insert(__off, 100);
7676
<RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec((v2.as_pointer() as Ptr<i32>)))
@@ -85,7 +85,7 @@ fn main_0() -> i32 {
8585
let __off = <RandomAccessIterator<i32>>::from(
8686
RandomAccessIterator::Vec((v2.as_pointer() as Ptr<i32>)).iter_add(1_isize),
8787
)
88-
.vec_ptr()
88+
.ptr()
8989
.get_offset();
9090
(*v2.borrow_mut()).insert(__off, x);
9191
<RandomAccessIterator<i32>>::from(
@@ -100,7 +100,7 @@ fn main_0() -> i32 {
100100
let __off = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
101101
(v2.as_pointer() as Ptr<i32>).to_end(),
102102
))
103-
.vec_ptr()
103+
.ptr()
104104
.get_offset();
105105
(*v2.borrow_mut()).splice(__off..__off, std::iter::repeat_n(9, 2_usize));
106106
<RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
@@ -114,7 +114,7 @@ fn main_0() -> i32 {
114114
let __off = <RandomAccessIterator<i32>>::from(
115115
RandomAccessIterator::Vec((v2.as_pointer() as Ptr<i32>)).iter_add(2_isize),
116116
)
117-
.vec_ptr()
117+
.ptr()
118118
.get_offset();
119119
(*v2.borrow_mut()).splice(__off..__off, vec![11, 12, 13]);
120120
<RandomAccessIterator<i32>>::from(
@@ -133,7 +133,7 @@ fn main_0() -> i32 {
133133
let start_idx = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
134134
(v2.as_pointer() as Ptr<i32>),
135135
))
136-
.vec_ptr()
136+
.ptr()
137137
.get_offset();
138138
let mut temp_vec: Vec<i32> = Vec::new();
139139
let mut __it = RandomAccessIterator::Vec((src.as_pointer() as Ptr<i32>));
@@ -154,7 +154,7 @@ fn main_0() -> i32 {
154154
let idx = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
155155
(v2.as_pointer() as Ptr<i32>),
156156
))
157-
.vec_ptr()
157+
.ptr()
158158
.get_offset();
159159
(v2.as_pointer() as Ptr<Vec<i32>>).with_mut(|__v: &mut Vec<i32>| __v.remove(idx));
160160
RandomAccessIterator::Vec((v2.as_pointer() as Ptr<Vec<i32>>).decay())
@@ -163,7 +163,7 @@ fn main_0() -> i32 {
163163
let idx = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
164164
(v2.as_pointer() as Ptr<i32>),
165165
))
166-
.vec_ptr()
166+
.ptr()
167167
.get_offset();
168168
(v2.as_pointer() as Ptr<Vec<i32>>).with_mut(|__v: &mut Vec<i32>| __v.remove(idx));
169169
RandomAccessIterator::Vec((v2.as_pointer() as Ptr<Vec<i32>>).decay())
@@ -174,7 +174,7 @@ fn main_0() -> i32 {
174174
let idx = <RandomAccessIterator<i32>>::from(
175175
RandomAccessIterator::Vec((v2.as_pointer() as Ptr<i32>)).iter_add(1_isize),
176176
)
177-
.vec_ptr()
177+
.ptr()
178178
.get_offset();
179179
(v2.as_pointer() as Ptr<Vec<i32>>).with_mut(|__v: &mut Vec<i32>| __v.remove(idx));
180180
RandomAccessIterator::Vec((v2.as_pointer() as Ptr<Vec<i32>>).decay())

‎tests/unit/out/refcount/vector_iter_range_ctor.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ fn main_0() -> i32 {
143143
RandomAccessIterator::Vec((v6.as_pointer() as Ptr<(Value<i32>, Value<i32>)>))
144144
.iter_add(1_isize),
145145
)
146-
.vec_ptr()
146+
.ptr()
147147
.get_offset();
148148
let mut temp_vec: Vec<(Value<i32>, Value<i32>)> = Vec::new();
149149
let mut __it = (m.as_pointer() as Ptr<Map<i32, (Value<i32>, Value<i32>)>>)

‎tests/unit/out/refcount/vector_with_allocator.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ fn main_0() -> i32 {
103103
let idx = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
104104
(v2.as_pointer() as Ptr<i32>),
105105
))
106-
.vec_ptr()
106+
.ptr()
107107
.get_offset();
108108
(v2.as_pointer() as Ptr<Vec<i32>>).with_mut(|__v: &mut Vec<i32>| __v.remove(idx));
109109
RandomAccessIterator::Vec((v2.as_pointer() as Ptr<Vec<i32>>).decay())
@@ -115,7 +115,7 @@ fn main_0() -> i32 {
115115
let __off = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
116116
(v2.as_pointer() as Ptr<i32>),
117117
))
118-
.vec_ptr()
118+
.ptr()
119119
.get_offset();
120120
(*v2.borrow_mut()).insert(__off, 100);
121121
<RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec((v2.as_pointer() as Ptr<i32>)))

‎tests/unit/out/unsafe/unboxed_conditional_iterator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub unsafe fn lehmer_2(mut sigma: *const u32, mut len: u32, mut code: *mut u32)
5757
(it.iter_distance(&UnsafeRandomAccessIterator::Vec(items.as_mut_ptr())) as u32);
5858
{
5959
let pos = <UnsafeRandomAccessIterator<u32>>::from((it).clone())
60-
.vec_ptr()
60+
.ptr()
6161
.offset_from(items.as_ptr()) as usize;
6262
items.remove(pos);
6363
<UnsafeRandomAccessIterator<u32>>::from((it).clone())

‎tests/unit/out/unsafe/vector.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ unsafe fn main_0() -> i32 {
5959
let pos = <UnsafeRandomAccessIterator<i32>>::from(UnsafeRandomAccessIterator::Vec(
6060
v2.as_mut_ptr(),
6161
))
62-
.vec_ptr()
62+
.ptr()
6363
.offset_from(v2.as_ptr()) as usize;
6464
v2.remove(pos);
6565
<UnsafeRandomAccessIterator<i32>>::from(UnsafeRandomAccessIterator::Vec(v2.as_mut_ptr()))
@@ -71,7 +71,7 @@ unsafe fn main_0() -> i32 {
7171
let pos = <UnsafeRandomAccessIterator<i32>>::from(UnsafeRandomAccessIterator::Vec(
7272
v2.as_mut_ptr(),
7373
))
74-
.vec_ptr()
74+
.ptr()
7575
.offset_from(v2.as_ptr()) as usize;
7676
v2.insert(pos, 100);
7777
<UnsafeRandomAccessIterator<i32>>::from(UnsafeRandomAccessIterator::Vec(v2.as_mut_ptr()))
@@ -86,7 +86,7 @@ unsafe fn main_0() -> i32 {
8686
let pos = <UnsafeRandomAccessIterator<i32>>::from(
8787
UnsafeRandomAccessIterator::Vec(v2.as_mut_ptr()).iter_add(1_isize),
8888
)
89-
.vec_ptr()
89+
.ptr()
9090
.offset_from(v2.as_ptr()) as usize;
9191
v2.insert(pos, x);
9292
<UnsafeRandomAccessIterator<i32>>::from(
@@ -101,7 +101,7 @@ unsafe fn main_0() -> i32 {
101101
let __off = <UnsafeRandomAccessIterator<i32>>::from(UnsafeRandomAccessIterator::Vec(
102102
v2.as_mut_ptr().add(v2.len()),
103103
))
104-
.vec_ptr()
104+
.ptr()
105105
.offset_from(v2.as_ptr()) as usize;
106106
v2.splice(__off..__off, std::iter::repeat_n(9, 2_usize));
107107
UnsafeRandomAccessIterator::Vec(v2.as_mut_ptr().add(__off))
@@ -113,7 +113,7 @@ unsafe fn main_0() -> i32 {
113113
let __off = <UnsafeRandomAccessIterator<i32>>::from(
114114
UnsafeRandomAccessIterator::Vec(v2.as_mut_ptr()).iter_add(2_isize),
115115
)
116-
.vec_ptr()
116+
.ptr()
117117
.offset_from(v2.as_ptr()) as usize;
118118
v2.splice(__off..__off, vec![11, 12, 13]);
119119
UnsafeRandomAccessIterator::Vec(v2.as_mut_ptr().add(__off))
@@ -130,7 +130,7 @@ unsafe fn main_0() -> i32 {
130130
let __off = <UnsafeRandomAccessIterator<i32>>::from(UnsafeRandomAccessIterator::Vec(
131131
v2.as_mut_ptr(),
132132
))
133-
.vec_ptr()
133+
.ptr()
134134
.offset_from(v2.as_ptr()) as usize;
135135
let mut __tmp = Vec::new();
136136
let mut __it = UnsafeRandomAccessIterator::Vec(src.as_mut_ptr());
@@ -149,7 +149,7 @@ unsafe fn main_0() -> i32 {
149149
let pos = <UnsafeRandomAccessIterator<i32>>::from(UnsafeRandomAccessIterator::Vec(
150150
v2.as_mut_ptr(),
151151
))
152-
.vec_ptr()
152+
.ptr()
153153
.offset_from(v2.as_ptr()) as usize;
154154
v2.remove(pos);
155155
<UnsafeRandomAccessIterator<i32>>::from(UnsafeRandomAccessIterator::Vec(v2.as_mut_ptr()))
@@ -158,7 +158,7 @@ unsafe fn main_0() -> i32 {
158158
let pos = <UnsafeRandomAccessIterator<i32>>::from(UnsafeRandomAccessIterator::Vec(
159159
v2.as_mut_ptr(),
160160
))
161-
.vec_ptr()
161+
.ptr()
162162
.offset_from(v2.as_ptr()) as usize;
163163
v2.remove(pos);
164164
<UnsafeRandomAccessIterator<i32>>::from(UnsafeRandomAccessIterator::Vec(v2.as_mut_ptr()))
@@ -169,7 +169,7 @@ unsafe fn main_0() -> i32 {
169169
let pos = <UnsafeRandomAccessIterator<i32>>::from(
170170
UnsafeRandomAccessIterator::Vec(v2.as_mut_ptr()).iter_add(1_isize),
171171
)
172-
.vec_ptr()
172+
.ptr()
173173
.offset_from(v2.as_ptr()) as usize;
174174
v2.remove(pos);
175175
<UnsafeRandomAccessIterator<i32>>::from(

‎tests/unit/out/unsafe/vector_iter_range_ctor.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ unsafe fn main_0() -> i32 {
106106
let __off = <UnsafeRandomAccessIterator<(i32, i32)>>::from(
107107
UnsafeRandomAccessIterator::Vec(v6.as_mut_ptr()).iter_add(1_isize),
108108
)
109-
.vec_ptr()
109+
.ptr()
110110
.offset_from(v6.as_ptr()) as usize;
111111
let mut __tmp = Vec::new();
112112
let mut __it = m.begin();

0 commit comments

Comments
 (0)