Fixed stuff forgotten last commit and fixed typos

Author: y86-dev

drivers/android/process.rs

@@ -712,7 +712,7 @@ impl Process {
                     self.clone(),
                     cookie,
                 ))
-                .map_err(|(i, _)| i)?,
+                .unwrap_or_else(|(err, _)| match err {}),
         );
 
         info.death = Some(death.clone());

rust/kernel/sync.rs

@@ -158,13 +158,13 @@ impl<T> StaticInit<T> {
     /// # Safety
     ///
     /// The caller calls this function exactly once and before any other function (even implicitly
-    /// derefing) of `self` is called. `self` stays pinned indefinetly.
-    pub unsafe fn init<E>(&self, init: impl PinInit<T, E>)
+    /// derefing) of `self` is called. `self` stays pinned indefinitely.
+    pub unsafe fn init<E>(&'static self, init: impl PinInit<T, E>)
     where
         E: Into<core::convert::Infallible>,
     {
         // SAFETY: This function has unique access to `self` because of the unsafety contract.
-        // `self` is also pinned indefinetly and `inner` is structurally pinned.
+        // `self` is also pinned indefinitely and `inner` is structurally pinned.
         unsafe {
             let ptr = UnsafeCell::raw_get(self.inner.as_ptr());
             match init.__pinned_init(ptr).map_err(|e| e.into()) {

rust/macros/pinned_drop.rs

@@ -32,19 +32,21 @@ pub(crate) fn pinned_drop(_args: TokenStream, input: TokenStream) -> TokenStream
         }
     }
     let idx = pinned_drop_idx.unwrap();
-    //inserting `::kernel::init::` in reverse order
-    toks.insert(idx, TokenTree::Punct(Punct::new(':', Spacing::Alone)));
-    toks.insert(idx, TokenTree::Punct(Punct::new(':', Spacing::Joint)));
-    toks.insert(idx, TokenTree::Ident(Ident::new("init", Span::call_site())));
-    toks.insert(idx, TokenTree::Punct(Punct::new(':', Spacing::Alone)));
-    toks.insert(idx, TokenTree::Punct(Punct::new(':', Spacing::Joint)));
-    toks.insert(
-        idx,
-        TokenTree::Ident(Ident::new("kernel", Span::call_site())),
+    // fully qualify the `PinnedDrop`.
+    toks.splice(
+        idx..idx,
+        vec![
+            TokenTree::Punct(Punct::new(':', Spacing::Joint)),
+            TokenTree::Punct(Punct::new(':', Spacing::Alone)),
+            TokenTree::Ident(Ident::new("kernel", Span::call_site())),
+            TokenTree::Punct(Punct::new(':', Spacing::Joint)),
+            TokenTree::Punct(Punct::new(':', Spacing::Alone)),
+            TokenTree::Ident(Ident::new("init", Span::call_site())),
+            TokenTree::Punct(Punct::new(':', Spacing::Joint)),
+            TokenTree::Punct(Punct::new(':', Spacing::Alone)),
+        ],
     );
-    toks.insert(idx, TokenTree::Punct(Punct::new(':', Spacing::Alone)));
-    toks.insert(idx, TokenTree::Punct(Punct::new(':', Spacing::Joint)));
-    // take the {} body
+    // take the {} body.
     if let Some(TokenTree::Group(last)) = toks.pop() {
         TokenStream::from_iter(vec![
             TokenTree::Punct(Punct::new(':', Spacing::Joint)),