Skip to content

Commit 511ba9c

Browse files
y86-devy86-dev
committed
Renamed pin_project -> pin_data 
1 parent 015c317 commit 511ba9c

21 files changed

+77
-77
lines changed

‎drivers/android/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ struct Manager {
1717
uid: Option<bindings::kuid_t>,
1818
}
1919

20-
#[pin_project]
20+
#[pin_data]
2121
pub(crate) struct Context {
2222
#[pin]
2323
manager: Mutex<Manager>,

‎drivers/android/node.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct NodeDeathInner {
5656
aborted: bool,
5757
}
5858

59-
#[pin_project]
59+
#[pin_data]
6060
pub(crate) struct NodeDeath {
6161
node: Arc<Node>,
6262
process: Arc<Process>,

‎drivers/android/process.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ impl ProcessNodeRefs {
241241
}
242242
}
243243

244-
#[pin_project]
244+
#[pin_data]
245245
pub(crate) struct Process {
246246
ctx: Arc<Context>,
247247

‎drivers/android/thread.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ impl InnerThread {
230230
}
231231
}
232232

233-
#[pin_project]
233+
#[pin_data]
234234
pub(crate) struct Thread {
235235
pub(crate) id: i32,
236236
pub(crate) process: Arc<Process>,

‎drivers/android/transaction.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct TransactionInner {
2828
file_list: List<Box<FileInfo>>,
2929
}
3030

31-
#[pin_project(PinnedDrop)]
31+
#[pin_data(PinnedDrop)]
3232
pub(crate) struct Transaction {
3333
#[pin]
3434
inner: SpinLock<TransactionInner>,

‎rust/kernel/device.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::{clk::Clk, error::from_kernel_err_ptr};
99

1010
use crate::{
1111
bindings,
12-
macros::pin_project,
12+
macros::pin_data,
1313
pin_init,
1414
prelude::*,
1515
revocable::{Revocable, RevocableGuard},
@@ -233,7 +233,7 @@ impl Drop for Device {
233233
///
234234
/// This struct implements the `DeviceRemoval` trait so that it can clean resources up even if not
235235
/// explicitly called by the device drivers.
236-
#[pin_project]
236+
#[pin_data]
237237
pub struct Data<T, U, V> {
238238
#[pin]
239239
registrations: RevocableMutex<T>,

‎rust/kernel/init.rs

+33-33
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
//!
2323
//! ## Directly creating an in-place constructor
2424
//!
25-
//! If you want to use [`PinInit`], then you will have to annotate your struct with [`#[pin_project]`].
25+
//! If you want to use [`PinInit`], then you will have to annotate your struct with [`#[pin_data]`].
2626
//! It is a macro that uses `#[pin]` as a marker for [structurally pinned fields].
2727
//!
2828
//! ```rust
2929
//! # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
3030
//! use kernel::{prelude::*, sync::Mutex, new_mutex};
3131
//! # use core::pin::Pin;
32-
//! #[pin_project]
32+
//! #[pin_data]
3333
//! struct Foo {
3434
//! #[pin]
3535
//! a: Mutex<usize>,
@@ -49,7 +49,7 @@
4949
//! # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
5050
//! # use kernel::{prelude::*, sync::Mutex, new_mutex};
5151
//! # use core::pin::Pin;
52-
//! # #[pin_project]
52+
//! # #[pin_data]
5353
//! # struct Foo {
5454
//! # #[pin]
5555
//! # a: Mutex<usize>,
@@ -76,7 +76,7 @@
7676
//! ```rust
7777
//! # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
7878
//! # use kernel::{sync::Mutex, prelude::*, new_mutex, init::PinInit, try_pin_init};
79-
//! #[pin_project]
79+
//! #[pin_data]
8080
//! struct DriverData {
8181
//! #[pin]
8282
//! status: Mutex<i32>,
@@ -118,7 +118,7 @@ use core::{
118118
#[doc(hidden)]
119119
pub mod __private;
120120
pub mod common;
121-
mod pin_project;
121+
mod pin_data;
122122
mod pinned_drop;
123123

124124
/// Initialize a type directly on the stack.
@@ -127,16 +127,16 @@ mod pinned_drop;
127127
///
128128
/// ```rust
129129
/// # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
130-
/// # use kernel::{init, pin_init, stack_init, init::*, macros::pin_project, sync::Mutex, new_mutex};
130+
/// # use kernel::{init, pin_init, stack_init, init::*, macros::pin_data, sync::Mutex, new_mutex};
131131
/// # use core::pin::Pin;
132-
/// #[pin_project]
132+
/// #[pin_data]
133133
/// struct Foo {
134134
/// #[pin]
135135
/// a: Mutex<usize>,
136136
/// b: Bar,
137137
/// }
138138
///
139-
/// #[pin_project]
139+
/// #[pin_data]
140140
/// struct Bar {
141141
/// x: u32,
142142
/// }
@@ -175,15 +175,15 @@ macro_rules! stack_init {
175175
///
176176
/// ```rust
177177
/// # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
178-
/// # use kernel::{init, pin_init, macros::pin_project, init::*};
178+
/// # use kernel::{init, pin_init, macros::pin_data, init::*};
179179
/// # use core::pin::Pin;
180-
/// #[pin_project]
180+
/// #[pin_data]
181181
/// struct Foo {
182182
/// a: usize,
183183
/// b: Bar,
184184
/// }
185185
///
186-
/// #[pin_project]
186+
/// #[pin_data]
187187
/// struct Bar {
188188
/// x: u32,
189189
/// }
@@ -215,12 +215,12 @@ macro_rules! stack_init {
215215
/// # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
216216
/// # use kernel::{init, pin_init, prelude::*, init::*};
217217
/// # use core::pin::Pin;
218-
/// # #[pin_project]
218+
/// # #[pin_data]
219219
/// # struct Foo {
220220
/// # a: usize,
221221
/// # b: Bar,
222222
/// # }
223-
/// # #[pin_project]
223+
/// # #[pin_data]
224224
/// # struct Bar {
225225
/// # x: u32,
226226
/// # }
@@ -241,14 +241,14 @@ macro_rules! stack_init {
241241
///
242242
/// ```rust
243243
/// # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
244-
/// # use kernel::{init, pin_init, macros::pin_project, init::*};
244+
/// # use kernel::{init, pin_init, macros::pin_data, init::*};
245245
/// # use core::pin::Pin;
246-
/// # #[pin_project]
246+
/// # #[pin_data]
247247
/// # struct Foo {
248248
/// # a: usize,
249249
/// # b: Bar,
250250
/// # }
251-
/// # #[pin_project]
251+
/// # #[pin_data]
252252
/// # struct Bar {
253253
/// # x: u32,
254254
/// # }
@@ -269,14 +269,14 @@ macro_rules! stack_init {
269269
///
270270
/// ```rust
271271
/// # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
272-
/// # use kernel::{init, pin_init, macros::pin_project, init::*};
272+
/// # use kernel::{init, pin_init, macros::pin_data, init::*};
273273
/// # use core::pin::Pin;
274-
/// # #[pin_project]
274+
/// # #[pin_data]
275275
/// # struct Foo {
276276
/// # a: usize,
277277
/// # b: Bar,
278278
/// # }
279-
/// # #[pin_project]
279+
/// # #[pin_data]
280280
/// # struct Bar {
281281
/// # x: u32,
282282
/// # }
@@ -290,7 +290,7 @@ macro_rules! stack_init {
290290
/// # })
291291
/// # }
292292
/// # }
293-
/// #[pin_project]
293+
/// #[pin_data]
294294
/// struct FooContainer {
295295
/// #[pin]
296296
/// foo1: Foo,
@@ -335,15 +335,15 @@ macro_rules! pin_init {
335335
///
336336
/// ```rust
337337
/// # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
338-
/// # use kernel::{init, pin_init, macros::pin_project, init::*};
338+
/// # use kernel::{init, pin_init, macros::pin_data, init::*};
339339
/// # use core::pin::Pin;
340-
/// #[pin_project]
340+
/// #[pin_data]
341341
/// struct Foo {
342342
/// a: usize,
343343
/// b: Bar,
344344
/// }
345345
///
346-
/// #[pin_project]
346+
/// #[pin_data]
347347
/// struct Bar {
348348
/// x: u32,
349349
/// }
@@ -375,12 +375,12 @@ macro_rules! pin_init {
375375
/// # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
376376
/// # use kernel::{init, pin_init, prelude::*, init::*};
377377
/// # use core::pin::Pin;
378-
/// # #[pin_project]
378+
/// # #[pin_data]
379379
/// # struct Foo {
380380
/// # a: usize,
381381
/// # b: Bar,
382382
/// # }
383-
/// # #[pin_project]
383+
/// # #[pin_data]
384384
/// # struct Bar {
385385
/// # x: u32,
386386
/// # }
@@ -401,14 +401,14 @@ macro_rules! pin_init {
401401
///
402402
/// ```rust
403403
/// # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
404-
/// # use kernel::{init, pin_init, macros::pin_project, init::*};
404+
/// # use kernel::{init, pin_init, macros::pin_data, init::*};
405405
/// # use core::pin::Pin;
406-
/// # #[pin_project]
406+
/// # #[pin_data]
407407
/// # struct Foo {
408408
/// # a: usize,
409409
/// # b: Bar,
410410
/// # }
411-
/// # #[pin_project]
411+
/// # #[pin_data]
412412
/// # struct Bar {
413413
/// # x: u32,
414414
/// # }
@@ -429,14 +429,14 @@ macro_rules! pin_init {
429429
///
430430
/// ```rust
431431
/// # #![allow(clippy::blacklisted_name, clippy::new_ret_no_self)]
432-
/// # use kernel::{init, pin_init, macros::pin_project, init::*};
432+
/// # use kernel::{init, pin_init, macros::pin_data, init::*};
433433
/// # use core::pin::Pin;
434-
/// # #[pin_project]
434+
/// # #[pin_data]
435435
/// # struct Foo {
436436
/// # a: usize,
437437
/// # b: Bar,
438438
/// # }
439-
/// # #[pin_project]
439+
/// # #[pin_data]
440440
/// # struct Bar {
441441
/// # x: u32,
442442
/// # }
@@ -450,7 +450,7 @@ macro_rules! pin_init {
450450
/// # })
451451
/// # }
452452
/// # }
453-
/// #[pin_project]
453+
/// #[pin_data]
454454
/// struct FooContainer {
455455
/// #[pin]
456456
/// foo1: Foo,
@@ -1046,7 +1046,7 @@ pub const unsafe fn pin_init_from_closure<T, E>(
10461046
/// ```rust
10471047
/// # use kernel::sync::Mutex;
10481048
/// use kernel::macros::pinned_drop;
1049-
/// #[pin_project(PinnedDrop)]
1049+
/// #[pin_data(PinnedDrop)]
10501050
/// struct Foo {
10511051
/// #[pin]
10521052
/// mtx: Mutex<usize>,

‎rust/kernel/init/pin_project.rs renamed to ‎rust/kernel/init/pin_data.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// use the proc macro instead
44
#[doc(hidden)]
55
#[macro_export]
6-
macro_rules! pin_project {
6+
macro_rules! _pin_data {
77
(parse_input:
88
@args($($pinned_drop:ident)?),
99
@sig(
@@ -15,7 +15,7 @@ macro_rules! pin_project {
1515
@ty_generics($($ty_generics:tt)*),
1616
@body({ $($fields:tt)* }),
1717
) => {
18-
$crate::pin_project!(find_pinned_fields:
18+
$crate::_pin_data!(find_pinned_fields:
1919
@struct_attrs($(#[$($struct_attr)*])*),
2020
@vis($vis),
2121
@name($name),
@@ -46,7 +46,7 @@ macro_rules! pin_project {
4646
@is_pinned(yes),
4747
@pinned_drop($($pinned_drop:ident)?),
4848
) => {
49-
$crate::pin_project!(find_pinned_fields:
49+
$crate::_pin_data!(find_pinned_fields:
5050
@struct_attrs($($struct_attrs)*),
5151
@vis($vis),
5252
@name($name),
@@ -77,7 +77,7 @@ macro_rules! pin_project {
7777
@is_pinned(),
7878
@pinned_drop($($pinned_drop:ident)?),
7979
) => {
80-
$crate::pin_project!(find_pinned_fields:
80+
$crate::_pin_data!(find_pinned_fields:
8181
@struct_attrs($($struct_attrs)*),
8282
@vis($vis),
8383
@name($name),
@@ -108,7 +108,7 @@ macro_rules! pin_project {
108108
@is_pinned($($is_pinned:ident)?),
109109
@pinned_drop($($pinned_drop:ident)?),
110110
) => {
111-
$crate::pin_project!(find_pinned_fields:
111+
$crate::_pin_data!(find_pinned_fields:
112112
@struct_attrs($($struct_attrs)*),
113113
@vis($vis),
114114
@name($name),
@@ -139,7 +139,7 @@ macro_rules! pin_project {
139139
@is_pinned($($is_pinned:ident)?),
140140
@pinned_drop($($pinned_drop:ident)?),
141141
) => {
142-
$crate::pin_project!(find_pinned_fields:
142+
$crate::_pin_data!(find_pinned_fields:
143143
@struct_attrs($($struct_attrs)*),
144144
@vis($vis),
145145
@name($name),
@@ -170,7 +170,7 @@ macro_rules! pin_project {
170170
@is_pinned($($is_pinned:ident)?),
171171
@pinned_drop($($pinned_drop:ident)?),
172172
) => {
173-
$crate::pin_project!(find_pinned_fields:
173+
$crate::_pin_data!(find_pinned_fields:
174174
@struct_attrs($($struct_attrs)*),
175175
@vis($vis),
176176
@name($name),
@@ -215,7 +215,7 @@ macro_rules! pin_project {
215215
__phantom: ::core::marker::PhantomData<fn($name<$($ty_generics)*>) -> $name<$($ty_generics)*>>,
216216
}
217217

218-
$crate::pin_project!(make_pin_data:
218+
$crate::_pin_data!(make_pin_data:
219219
@pin_data(__ThePinData),
220220
@impl_generics($($impl_generics)*),
221221
@ty_generics($($ty_generics)*),
@@ -246,7 +246,7 @@ macro_rules! pin_project {
246246
$($whr)*
247247
{}
248248

249-
$crate::pin_project!(drop_prevention:
249+
$crate::_pin_data!(drop_prevention:
250250
@name($name),
251251
@impl_generics($($impl_generics)*),
252252
@ty_generics($($ty_generics)*),

‎rust/kernel/kasync/executor/workqueue.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use super::{ArcWake, AutoStopHandle};
66
use crate::{
77
error::code::*,
8-
macros::pin_project,
8+
macros::pin_data,
99
new_mutex, pin_init,
1010
prelude::*,
1111
revocable::AsyncRevocable,
@@ -190,7 +190,7 @@ struct ExecutorInner {
190190
///
191191
/// # Ok::<(), Error>(())
192192
/// ```
193-
#[pin_project]
193+
#[pin_data]
194194
pub struct Executor {
195195
queue: Either<BoxedQueue, &'static Queue>,
196196
#[pin]

0 commit comments

Comments
 (0)