Skip to content

Commit cb9f320

Browse files
committed
Added try[_pin]_init! and removed turbofish
1 parent b5b8cef commit cb9f320

File tree

11 files changed

+406
-43
lines changed

11 files changed

+406
-43
lines changed

drivers/android/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ unsafe impl Sync for Context {}
2929

3030
impl Context {
3131
pub(crate) fn new() -> Result<Arc<Self>> {
32-
Arc::pin_init::<core::convert::Infallible>(pin_init!(Self {
32+
Arc::pin_init(pin_init!(Self {
3333
manager: new_mutex!(
3434
Manager {
3535
node: None,

drivers/android/process.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ unsafe impl Sync for Process {}
270270

271271
impl Process {
272272
fn new(ctx: Arc<Context>, cred: ARef<Credential>) -> Result<Arc<Self>> {
273-
Arc::pin_init::<core::convert::Infallible>(pin_init!(Self {
273+
Arc::pin_init(pin_init!(Self {
274274
ctx,
275275
cred,
276276
task: ARef::from(Task::current().group_leader()),

drivers/android/thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ impl Thread {
245245
pub(crate) fn new(id: i32, process: Arc<Process>) -> Result<Arc<Self>> {
246246
let return_work = Arc::try_new(ThreadError::new(InnerThread::set_return_work))?;
247247
let reply_work = Arc::try_new(ThreadError::new(InnerThread::set_reply_work))?;
248-
let thread = Arc::pin_init::<core::convert::Infallible>(pin_init!(Self {
248+
let thread = Arc::pin_init(pin_init!(Self {
249249
id,
250250
process,
251251
inner: new_spinlock!(InnerThread::new(), "Thread::inner"),

drivers/android/transaction.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl Transaction {
5959
let data_address = alloc.ptr;
6060
let file_list = alloc.take_file_list();
6161
alloc.keep_alive();
62-
let tr = UniqueArc::pin_init::<core::convert::Infallible>(pin_init!(Self {
62+
let tr = UniqueArc::pin_init(pin_init!(Self {
6363
inner: new_spinlock!(TransactionInner { file_list }, "Transaction::inner"),
6464
node_ref: Some(node_ref),
6565
stack_next,
@@ -86,7 +86,7 @@ impl Transaction {
8686
let data_address = alloc.ptr;
8787
let file_list = alloc.take_file_list();
8888
alloc.keep_alive();
89-
let tr = UniqueArc::pin_init::<core::convert::Infallible>(pin_init!(Self {
89+
let tr = UniqueArc::pin_init(pin_init!(Self {
9090
inner: new_spinlock!(TransactionInner { file_list }, "Transaction::inner"),
9191
node_ref: None,
9292
stack_next: None,

rust/kernel/device.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ impl<T, U, V> Data<T, U, V> {
267267
name: &'static CStr,
268268
key1: &'static LockClassKey,
269269
) -> Result<Pin<UniqueArc<Self>>> {
270-
UniqueArc::pin_init::<core::convert::Infallible>(pin_init!(Self {
270+
UniqueArc::pin_init(pin_init!(Self {
271271
registrations: RevocableMutex::new(registrations, name, key1),
272272
resources: Revocable::new(resources),
273273
general,

0 commit comments

Comments
 (0)