diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib.rs | 4 | ||||
| -rw-r--r-- | src/mod.rs | 8 | ||||
| -rw-r--r-- | src/ops/dir.rs | 2 | ||||
| -rw-r--r-- | src/ops/entry.rs | 2 | ||||
| -rw-r--r-- | src/ops/global.rs | 2 | ||||
| -rw-r--r-- | src/ops/inode.rs | 2 | ||||
| -rw-r--r-- | src/ops/mod.rs | 5 | ||||
| -rw-r--r-- | src/ops/open.rs | 2 | ||||
| -rw-r--r-- | src/ops/rw.rs | 2 | ||||
| -rw-r--r-- | src/ops/xattr.rs | 5 |
10 files changed, 12 insertions, 22 deletions
@@ -25,7 +25,7 @@ pub mod session; mod proto; mod util; -pub trait Operation<'o>: private_trait::Sealed + Sized { +pub trait Operation<'o>: sealed::Sealed + Sized { type RequestBody: crate::proto::Structured<'o>; type ReplyState; } @@ -161,6 +161,6 @@ impl From<SystemTime> for Timestamp { } } -mod private_trait { +mod sealed { pub trait Sealed {} } @@ -1,4 +1,4 @@ -use crate::proto; +use crate::{proto, sealed::Sealed}; use std::marker::PhantomData; pub mod io; @@ -6,11 +6,7 @@ pub mod mount; pub mod ops; pub mod session; -mod private_trait { - pub trait Sealed {} -} - -pub trait Operation<'o>: private_trait::Sealed + Sized { +pub trait Operation<'o>: Sealed + Sized { type RequestBody: crate::proto::Structured<'o>; type ReplyState; } diff --git a/src/ops/dir.rs b/src/ops/dir.rs index 5e2758a..210c13a 100644 --- a/src/ops/dir.rs +++ b/src/ops/dir.rs @@ -7,7 +7,7 @@ use std::{ use crate::{ io::{Entry, EntryType, Interruptible, Known, Stat}, - private_trait::Sealed, + sealed::Sealed, Done, Operation, Reply, Request, }; diff --git a/src/ops/entry.rs b/src/ops/entry.rs index 1af5483..af48914 100644 --- a/src/ops/entry.rs +++ b/src/ops/entry.rs @@ -3,7 +3,7 @@ use super::{ traits::{ReplyKnown, ReplyOk, RequestMode, RequestName}, }; -use crate::{io::Mode, private_trait::Sealed, proto, Ino, Operation, Request}; +use crate::{io::Mode, proto, sealed::Sealed, Ino, Operation, Request}; use std::ffi::{CStr, OsStr}; pub enum Mknod {} diff --git a/src/ops/global.rs b/src/ops/global.rs index 65954f0..38f0def 100644 --- a/src/ops/global.rs +++ b/src/ops/global.rs @@ -1,5 +1,5 @@ use super::traits::ReplyOk; -use crate::{io::FsInfo, private_trait::Sealed, proto, util::page_size, Done, Operation, Reply}; +use crate::{io::FsInfo, proto, sealed::Sealed, util::page_size, Done, Operation, Reply}; pub enum Init {} pub enum Statfs {} diff --git a/src/ops/inode.rs b/src/ops/inode.rs index 8f155e6..15e3854 100644 --- a/src/ops/inode.rs +++ b/src/ops/inode.rs @@ -1,5 +1,5 @@ use super::traits::{ReplyOk, RequestHandle}; -use crate::{io::Stat, private_trait::Sealed, proto, Done, Ino, Operation, Reply, Request}; +use crate::{io::Stat, proto, sealed::Sealed, Done, Ino, Operation, Reply, Request}; pub enum Forget {} pub enum Getattr {} diff --git a/src/ops/mod.rs b/src/ops/mod.rs index 0569b65..d4ebd72 100644 --- a/src/ops/mod.rs +++ b/src/ops/mod.rs @@ -3,10 +3,7 @@ use std::{ os::unix::ffi::OsStrExt, }; -use crate::{ - private_trait::Sealed, proto, util::OutputChain, Done, Ino, Operation, Reply, Request, Ttl, -}; - +use crate::{proto, sealed::Sealed, util::OutputChain, Done, Ino, Operation, Reply, Request, Ttl}; use bytemuck::{bytes_of, Pod}; pub mod traits; diff --git a/src/ops/open.rs b/src/ops/open.rs index 40a07a9..65d4c9a 100644 --- a/src/ops/open.rs +++ b/src/ops/open.rs @@ -1,7 +1,7 @@ use crate::{ io::{AccessFlags, Known, Mode, OpenFlags, Stat}, - private_trait::Sealed, proto, + sealed::Sealed, util::OutputChain, Done, Errno, Operation, Reply, Request, Ttl, }; diff --git a/src/ops/rw.rs b/src/ops/rw.rs index 4f5bad4..0f8ba22 100644 --- a/src/ops/rw.rs +++ b/src/ops/rw.rs @@ -5,7 +5,7 @@ use super::{ FromRequest, }; -use crate::{io::FsyncFlags, private_trait::Sealed, proto, Done, Operation, Reply, Request}; +use crate::{io::FsyncFlags, proto, sealed::Sealed, Done, Operation, Reply, Request}; pub enum Readlink {} pub enum Read {} diff --git a/src/ops/xattr.rs b/src/ops/xattr.rs index ee26cff..204edf1 100644 --- a/src/ops/xattr.rs +++ b/src/ops/xattr.rs @@ -1,12 +1,9 @@ -use crate::{ - private_trait::Sealed, proto, util::OutputChain, Done, Errno, Operation, Reply, Request, -}; - use super::{ c_to_os, traits::{ReplyGather, ReplyNotFound, ReplyOk, RequestData, RequestName, RequestSize}, }; +use crate::{proto, sealed::Sealed, util::OutputChain, Done, Errno, Operation, Reply, Request}; use std::ffi::{CStr, OsStr}; pub enum Setxattr {} |