refactor: alias sys traits (#77)

Author: dsherret

rs_lib/src/cache.rs

@@ -7,21 +7,14 @@ use std::borrow::Cow;
 use std::io::ErrorKind;
 use std::path::PathBuf;
 use std::time::SystemTime;
-use sys_traits::FsCreateDirAll;
-use sys_traits::FsMetadata;
-use sys_traits::FsOpen;
-use sys_traits::FsRead;
-use sys_traits::FsRemoveFile;
-use sys_traits::FsRename;
-use sys_traits::SystemRandom;
-use sys_traits::SystemTimeNow;
-use sys_traits::ThreadSleep;
 use thiserror::Error;
 use url::Url;
 
 use crate::common::base_url_to_filename_parts;
 use crate::common::checksum;
 use crate::common::HeadersMap;
+use crate::global::GlobalHttpCacheSys;
+use crate::local::LocalHttpCacheSys;
 use crate::sync::MaybeSend;
 use crate::sync::MaybeSync;
 use crate::GlobalHttpCacheRc;
@@ -205,82 +198,29 @@ pub trait HttpCache: MaybeSend + MaybeSync + std::fmt::Debug {
 }
 
 #[derive(Debug, Clone)]
-pub enum GlobalOrLocalHttpCache<
-  Sys: FsCreateDirAll
-    + FsMetadata
-    + FsOpen
-    + FsRemoveFile
-    + FsRename
-    + ThreadSleep
-    + SystemRandom
-    + SystemTimeNow
-    + std::fmt::Debug
-    + FsRead
-    + Clone
-    + MaybeSend
-    + MaybeSync,
-> {
+pub enum GlobalOrLocalHttpCache<Sys: GlobalHttpCacheSys + LocalHttpCacheSys> {
   Global(GlobalHttpCacheRc<Sys>),
   Local(LocalHttpCacheRc<Sys>),
 }
 
-impl<
-    Sys: FsCreateDirAll
-      + FsMetadata
-      + FsOpen
-      + FsRemoveFile
-      + FsRename
-      + ThreadSleep
-      + SystemRandom
-      + SystemTimeNow
-      + std::fmt::Debug
-      + FsRead
-      + Clone
-      + MaybeSend
-      + MaybeSync,
-  > From<GlobalHttpCacheRc<Sys>> for GlobalOrLocalHttpCache<Sys>
+impl<Sys: GlobalHttpCacheSys + LocalHttpCacheSys> From<GlobalHttpCacheRc<Sys>>
+  for GlobalOrLocalHttpCache<Sys>
 {
   fn from(global: GlobalHttpCacheRc<Sys>) -> Self {
     Self::Global(global)
   }
 }
 
-impl<
-    Sys: FsCreateDirAll
-      + FsMetadata
-      + FsOpen
-      + FsRemoveFile
-      + FsRename
-      + ThreadSleep
-      + SystemRandom
-      + SystemTimeNow
-      + std::fmt::Debug
-      + FsRead
-      + Clone
-      + MaybeSend
-      + MaybeSync,
-  > From<LocalHttpCacheRc<Sys>> for GlobalOrLocalHttpCache<Sys>
+impl<Sys: GlobalHttpCacheSys + LocalHttpCacheSys> From<LocalHttpCacheRc<Sys>>
+  for GlobalOrLocalHttpCache<Sys>
 {
   fn from(local: LocalHttpCacheRc<Sys>) -> Self {
     Self::Local(local)
   }
 }
 
-impl<
-    Sys: FsCreateDirAll
-      + FsMetadata
-      + FsOpen
-      + FsRemoveFile
-      + FsRename
-      + ThreadSleep
-      + SystemRandom
-      + SystemTimeNow
-      + std::fmt::Debug
-      + FsRead
-      + Clone
-      + MaybeSend
-      + MaybeSync,
-  > HttpCache for GlobalOrLocalHttpCache<Sys>
+impl<Sys: GlobalHttpCacheSys + LocalHttpCacheSys> HttpCache
+  for GlobalOrLocalHttpCache<Sys>
 {
   fn read_headers(
     &self,

rs_lib/src/global/mod.rs

@@ -31,35 +31,50 @@ use crate::sync::MaybeSync;
 
 mod cache_file;
 
-#[allow(clippy::disallowed_types)]
-pub type GlobalHttpCacheRc<TSys> = crate::sync::MaybeArc<GlobalHttpCache<TSys>>;
+pub trait GlobalHttpCacheSys:
+  FsCreateDirAll
+  + FsMetadata
+  + FsOpen
+  + FsRead
+  + FsRemoveFile
+  + FsRename
+  + ThreadSleep
+  + SystemRandom
+  + SystemTimeNow
+  + std::fmt::Debug
+  + MaybeSend
+  + MaybeSync
+  + Clone
+{
+}
 
-#[derive(Debug)]
-pub struct GlobalHttpCache<
-  Sys: FsCreateDirAll
+impl<T> GlobalHttpCacheSys for T where
+  T: FsCreateDirAll
     + FsMetadata
     + FsOpen
+    + FsRead
     + FsRemoveFile
     + FsRename
     + ThreadSleep
     + SystemRandom
-    + Clone,
-> {
+    + SystemTimeNow
+    + std::fmt::Debug
+    + MaybeSend
+    + MaybeSync
+    + Clone
+{
+}
+
+#[allow(clippy::disallowed_types)]
+pub type GlobalHttpCacheRc<TSys> = crate::sync::MaybeArc<GlobalHttpCache<TSys>>;
+
+#[derive(Debug)]
+pub struct GlobalHttpCache<Sys: GlobalHttpCacheSys> {
   path: PathBuf,
   pub(crate) sys: Sys,
 }
 
-impl<
-    Sys: FsCreateDirAll
-      + FsMetadata
-      + FsOpen
-      + FsRemoveFile
-      + FsRename
-      + ThreadSleep
-      + SystemRandom
-      + Clone,
-  > GlobalHttpCache<Sys>
-{
+impl<Sys: GlobalHttpCacheSys> GlobalHttpCache<Sys> {
   pub fn new(sys: Sys, path: PathBuf) -> Self {
     #[cfg(not(feature = "wasm"))]
     assert!(path.is_absolute());
@@ -83,22 +98,7 @@ impl<
   }
 }
 
-impl<
-    TSys: FsCreateDirAll
-      + FsMetadata
-      + FsOpen
-      + FsRead
-      + FsRemoveFile
-      + FsRename
-      + ThreadSleep
-      + SystemRandom
-      + SystemTimeNow
-      + std::fmt::Debug
-      + MaybeSend
-      + MaybeSync
-      + Clone,
-  > HttpCache for GlobalHttpCache<TSys>
-{
+impl<TSys: GlobalHttpCacheSys> HttpCache for GlobalHttpCache<TSys> {
   fn cache_item_key<'a>(
     &self,
     url: &'a Url,

rs_lib/src/local.rs

@@ -41,11 +41,25 @@ use super::Checksum;
 use super::HttpCache;
 use super::HttpCacheItemKey;
 
-/// A vendor/ folder http cache for the lsp that provides functionality
-/// for doing a reverse mapping.
-#[derive(Debug)]
-pub struct LocalLspHttpCache<
-  TSys: FsCreateDirAll
+pub trait LocalHttpCacheSys:
+  FsCreateDirAll
+  + FsMetadata
+  + FsOpen
+  + FsRead
+  + FsRemoveFile
+  + FsRename
+  + ThreadSleep
+  + SystemRandom
+  + SystemTimeNow
+  + MaybeSend
+  + MaybeSync
+  + std::fmt::Debug
+  + Clone
+{
+}
+
+impl<T> LocalHttpCacheSys for T where
+  T: FsCreateDirAll
     + FsMetadata
     + FsOpen
     + FsRead
@@ -57,27 +71,18 @@ pub struct LocalLspHttpCache<
     + MaybeSend
     + MaybeSync
     + std::fmt::Debug
-    + Clone,
-> {
+    + Clone
+{
+}
+
+/// A vendor/ folder http cache for the lsp that provides functionality
+/// for doing a reverse mapping.
+#[derive(Debug)]
+pub struct LocalLspHttpCache<TSys: LocalHttpCacheSys> {
   cache: LocalHttpCache<TSys>,
 }
 
-impl<
-    TSys: FsCreateDirAll
-      + FsMetadata
-      + FsOpen
-      + FsRead
-      + FsRemoveFile
-      + FsRename
-      + ThreadSleep
-      + SystemRandom
-      + SystemTimeNow
-      + MaybeSend
-      + MaybeSync
-      + std::fmt::Debug
-      + Clone,
-  > LocalLspHttpCache<TSys>
-{
+impl<TSys: LocalHttpCacheSys> LocalLspHttpCache<TSys> {
   pub fn new(path: PathBuf, global_cache: GlobalHttpCacheRc<TSys>) -> Self {
     #[cfg(not(feature = "wasm"))]
     assert!(path.is_absolute());
@@ -185,22 +190,7 @@ impl<
   }
 }
 
-impl<
-    TSys: FsCreateDirAll
-      + FsMetadata
-      + FsOpen
-      + FsRead
-      + FsRemoveFile
-      + FsRename
-      + ThreadSleep
-      + SystemRandom
-      + SystemTimeNow
-      + MaybeSend
-      + MaybeSync
-      + std::fmt::Debug
-      + Clone,
-  > HttpCache for LocalLspHttpCache<TSys>
-{
+impl<TSys: LocalHttpCacheSys> HttpCache for LocalLspHttpCache<TSys> {
   fn cache_item_key<'a>(
     &self,
     url: &'a Url,
@@ -255,43 +245,14 @@ impl<
 pub type LocalHttpCacheRc<TSys> = crate::sync::MaybeArc<LocalHttpCache<TSys>>;
 
 #[derive(Debug)]
-pub struct LocalHttpCache<
-  TSys: FsCreateDirAll
-    + FsMetadata
-    + FsOpen
-    + FsRead
-    + FsRemoveFile
-    + FsRename
-    + ThreadSleep
-    + SystemRandom
-    + SystemTimeNow
-    + MaybeSend
-    + MaybeSync
-    + std::fmt::Debug
-    + Clone,
-> {
+pub struct LocalHttpCache<TSys: LocalHttpCacheSys> {
   path: PathBuf,
   manifest: LocalCacheManifest<TSys>,
   global_cache: GlobalHttpCacheRc<TSys>,
   allow_global_to_local: GlobalToLocalCopy,
 }
 
-impl<
-    TSys: FsCreateDirAll
-      + FsMetadata
-      + FsOpen
-      + FsRead
-      + FsRemoveFile
-      + FsRename
-      + ThreadSleep
-      + SystemRandom
-      + SystemTimeNow
-      + MaybeSend
-      + MaybeSync
-      + std::fmt::Debug
-      + Clone,
-  > LocalHttpCache<TSys>
-{
+impl<TSys: LocalHttpCacheSys> LocalHttpCache<TSys> {
   pub fn new(
     path: PathBuf,
     global_cache: GlobalHttpCacheRc<TSys>,
@@ -373,22 +334,7 @@ impl<
   }
 }
 
-impl<
-    TSys: FsCreateDirAll
-      + FsMetadata
-      + FsOpen
-      + FsRead
-      + FsRemoveFile
-      + FsRename
-      + ThreadSleep
-      + SystemRandom
-      + SystemTimeNow
-      + MaybeSend
-      + MaybeSync
-      + std::fmt::Debug
-      + Clone,
-  > HttpCache for LocalHttpCache<TSys>
-{
+impl<TSys: LocalHttpCacheSys> HttpCache for LocalHttpCache<TSys> {
   fn cache_item_key<'a>(
     &self,
     url: &'a Url,