fix: proper scoping for libsys in auto_inode

fs/macros/src/lib.rs

@@ -9,59 +9,81 @@ use std::collections::HashSet;
 use syn::{parse_macro_input, ImplItem, ItemImpl, Ident};
 
 fn impl_inode_fn<T: ToTokens>(name: &str, behavior: T) -> ImplItem {
+    // TODO somehow know if current crate is vfs or not?
     ImplItem::Verbatim(match name {
         "create" => quote! {
-            fn create(&mut self, _at: VnodeRef, _name: &str, kind: VnodeKind) -> Result<VnodeRef, Errno> {
+            fn create(&mut self, _at: VnodeRef, _name: &str, kind: VnodeKind) ->
+                Result<VnodeRef, libsys::error::Errno>
+            {
                 #behavior
             }
         },
         "remove" => quote! {
-            fn remove(&mut self, _at: VnodeRef, _name: &str) -> Result<(), Errno> {
+            fn remove(&mut self, _at: VnodeRef, _name: &str) -> Result<(), libsys::error::Errno> {
                 #behavior
             }
         },
         "lookup" => quote! {
-            fn lookup(&mut self, _at: VnodeRef, _name: &str) -> Result<VnodeRef, Errno> {
+            fn lookup(&mut self, _at: VnodeRef, _name: &str) ->
+                Result<VnodeRef, libsys::error::Errno>
+            {
                 #behavior
             }
         },
         "stat" => quote! {
-            fn stat(&mut self, _at: VnodeRef, _stat: &mut Stat) -> Result<(), Errno> {
+            fn stat(&mut self, _at: VnodeRef, _stat: &mut libsys::stat::Stat) ->
+                Result<(), libsys::error::Errno>
+            {
                 #behavior
             }
         },
         "truncate" => quote! {
-            fn truncate(&mut self, _node: VnodeRef, _size: usize) -> Result<(), Errno> {
+            fn truncate(&mut self, _node: VnodeRef, _size: usize) ->
+                Result<(), libsys::error::Errno>
+            {
                 #behavior
             }
         },
         "size" => quote! {
-            fn size(&mut self, _node: VnodeRef) -> Result<usize, Errno> {
+            fn size(&mut self, _node: VnodeRef) -> Result<usize, libsys::error::Errno> {
                 #behavior
             }
         },
         "read" => quote! {
-            fn read(&mut self, _node: VnodeRef, _pos: usize, _data: &mut [u8]) -> Result<usize, Errno> {
+            fn read(&mut self, _node: VnodeRef, _pos: usize, _data: &mut [u8]) ->
+                Result<usize, libsys::error::Errno>
+            {
                 #behavior
             }
         },
         "write" => quote! {
-            fn write(&mut self, _node: VnodeRef, _pos: usize, _data: &[u8]) -> Result<usize, Errno> {
+            fn write(&mut self, _node: VnodeRef, _pos: usize, _data: &[u8]) ->
+                Result<usize, libsys::error::Errno>
+            {
                 #behavior
             }
         },
         "open" => quote! {
-            fn open(&mut self, _node: VnodeRef, _flags: OpenFlags) -> Result<usize, Errno> {
+            fn open(&mut self, _node: VnodeRef, _flags: libsys::stat::OpenFlags) ->
+                Result<usize, libsys::error::Errno>
+            {
                 #behavior
             }
         },
         "close" => quote! {
-            fn close(&mut self, _node: VnodeRef) -> Result<(), Errno> {
+            fn close(&mut self, _node: VnodeRef) -> Result<(), libsys::error::Errno> {
                 #behavior
             }
         },
         "ioctl" => quote! {
-            fn ioctl(&mut self, _node: VnodeRef, _cmd: IoctlCmd, _ptr: usize, _len: usize) -> Result<usize, Errno> {
+            fn ioctl(
+                &mut self,
+                _node: VnodeRef,
+                _cmd: libsys::ioctl::IoctlCmd,
+                _ptr: usize,
+                _len: usize) ->
+                Result<usize, libsys::error::Errno>
+            {
                 #behavior
             }
         },

fs/memfs/src/dir.rs

@@ -1,10 +1,6 @@
 use crate::{BlockAllocator, Bvec, FileInode};
 use alloc::boxed::Box;
-use libsys::{
-    error::Errno,
-    stat::{OpenFlags, Stat},
-    ioctl::IoctlCmd
-};
+use libsys::error::Errno;
 use vfs::{Vnode, VnodeImpl, VnodeKind, VnodeRef};
 
 pub struct DirInode<A: BlockAllocator + Copy + 'static> {

fs/memfs/src/file.rs

@@ -2,7 +2,6 @@ use crate::{BlockAllocator, Bvec};
 use libsys::{
     error::Errno,
     stat::{OpenFlags, Stat},
-    ioctl::IoctlCmd
 };
 use vfs::{VnodeImpl, VnodeKind, VnodeRef};
 

fs/vfs/src/char.rs

@@ -1,9 +1,5 @@
 use crate::{VnodeImpl, VnodeKind, VnodeRef};
-use libsys::{
-    error::Errno,
-    stat::{OpenFlags, Stat},
-    ioctl::IoctlCmd
-};
+use libsys::{error::Errno, ioctl::IoctlCmd, stat::OpenFlags};
 
 /// Generic character device trait
 pub trait CharDevice {
@@ -48,7 +44,13 @@ impl VnodeImpl for CharDeviceWrapper {
         self.device.write(true, data)
     }
 
-    fn ioctl(&mut self, _node: VnodeRef, cmd: IoctlCmd, ptr: usize, len: usize) -> Result<usize, Errno> {
+    fn ioctl(
+        &mut self,
+        _node: VnodeRef,
+        cmd: IoctlCmd,
+        ptr: usize,
+        len: usize,
+    ) -> Result<usize, Errno> {
         self.device.ioctl(cmd, ptr, len)
     }
 }