Merge pull request #282 from adamnemecek/master

use Self

Author: phiresky

src/adapters/decompress.rs

@@ -41,8 +41,8 @@ lazy_static! {
 pub struct DecompressAdapter;
 
 impl DecompressAdapter {
-    pub fn new() -> DecompressAdapter {
-        DecompressAdapter
+    pub fn new() -> Self {
+        Self
     }
 }
 impl GetMetadata for DecompressAdapter {

src/adapters/ffmpeg.rs

@@ -38,8 +38,8 @@ lazy_static! {
 pub struct FFmpegAdapter;
 
 impl FFmpegAdapter {
-    pub fn new() -> FFmpegAdapter {
-        FFmpegAdapter
+    pub fn new() -> Self {
+        Self
     }
 }
 impl GetMetadata for FFmpegAdapter {

src/adapters/mbox.rs

@@ -38,8 +38,8 @@ lazy_static! {
 pub struct MboxAdapter;
 
 impl MboxAdapter {
-    pub fn new() -> MboxAdapter {
-        MboxAdapter
+    pub fn new() -> Self {
+        Self
     }
 }
 impl GetMetadata for MboxAdapter {

src/adapters/sqlite.rs

@@ -36,8 +36,8 @@ lazy_static! {
 pub struct SqliteAdapter;
 
 impl SqliteAdapter {
-    pub fn new() -> SqliteAdapter {
-        SqliteAdapter
+    pub fn new() -> Self {
+        Self
     }
 }
 impl GetMetadata for SqliteAdapter {

src/adapters/tar.rs

@@ -36,8 +36,8 @@ lazy_static! {
 pub struct TarAdapter;
 
 impl TarAdapter {
-    pub fn new() -> TarAdapter {
-        TarAdapter
+    pub fn new() -> Self {
+        Self
     }
 }
 impl GetMetadata for TarAdapter {

src/adapters/zip.rs

@@ -28,8 +28,8 @@ lazy_static! {
 pub struct ZipAdapter;
 
 impl ZipAdapter {
-    pub fn new() -> ZipAdapter {
-        ZipAdapter
+    pub fn new() -> Self {
+        Self
     }
 }
 impl GetMetadata for ZipAdapter {

src/config.rs

@@ -25,7 +25,7 @@ impl std::fmt::Display for CacheCompressionLevel {
 }
 impl Default for CacheCompressionLevel {
     fn default() -> Self {
-        CacheCompressionLevel(12)
+        Self(12)
     }
 }
 #[derive(JsonSchema, Debug, Serialize, Deserialize, Copy, Clone, PartialEq, FromStr)]
@@ -38,7 +38,7 @@ impl std::fmt::Display for MaxArchiveRecursion {
 }
 impl Default for MaxArchiveRecursion {
     fn default() -> Self {
-        MaxArchiveRecursion(5)
+        Self(5)
     }
 }
 
@@ -54,7 +54,7 @@ impl Default for CachePath {
     fn default() -> Self {
         let pd = project_dirs().expect("could not get cache path");
         let app_cache = pd.cache_dir();
-        CachePath(app_cache.to_str().expect("cache path not utf8").to_owned())
+        Self(app_cache.to_str().expect("cache path not utf8").to_owned())
     }
 }
 
@@ -68,7 +68,7 @@ impl std::fmt::Display for CacheMaxBlobLen {
 }
 impl Default for CacheMaxBlobLen {
     fn default() -> Self {
-        CacheMaxBlobLen(2000000)
+        Self(2000000)
     }
 }
 
@@ -77,7 +77,7 @@ impl FromStr for CacheMaxBlobLen {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let suffix = s.chars().last();
         if let Some(suffix) = suffix {
-            Ok(CacheMaxBlobLen(match suffix {
+            Ok(Self(match suffix {
                 'k' | 'M' | 'G' => usize::from_str(s.trim_end_matches(suffix))
                     .with_context(|| "Could not parse int".to_string())
                     .map(|e| {

src/matching.rs

@@ -36,7 +36,7 @@ pub enum FileMatcher {
 
 impl From<FastFileMatcher> for FileMatcher {
     fn from(t: FastFileMatcher) -> Self {
-        FileMatcher::Fast(t)
+        Self::Fast(t)
     }
 }
 

src/preproc_cache.rs

@@ -22,7 +22,7 @@ impl CacheKey {
         filepath_hint: &Path,
         adapter: &dyn FileAdapter,
         active_adapters: &ActiveAdapters,
-    ) -> Result<CacheKey> {
+    ) -> Result<Self> {
         let meta = std::fs::metadata(filepath_hint)
             .with_context(|| format!("reading metadata for {}", filepath_hint.to_string_lossy()))?;
         let modified = meta.modified().expect("weird OS that can't into mtime");
@@ -37,7 +37,7 @@ impl CacheKey {
         } else {
             "null".to_string()
         };
-        Ok(CacheKey {
+        Ok(Self {
             config_hash: if postprocess {
                 "a41e2e9".to_string()
             } else {
@@ -103,7 +103,7 @@ struct SqliteCache {
     db: Connection,
 }
 impl SqliteCache {
-    async fn new(path: &Path) -> Result<SqliteCache> {
+    async fn new(path: &Path) -> Result<Self> {
         let db = Connection::open(path.join("cache.sqlite3")).await?;
         db.call(|db| {
             let schema_version: i32 = db.pragma_query_value(None, "user_version", |r| r.get(0))?;
@@ -118,7 +118,7 @@ impl SqliteCache {
 
         connect_pragmas(&db).await?;
 
-        Ok(SqliteCache { db })
+        Ok(Self { db })
     }
 }