From d179dced4ec8983bc9795384380b201bb31c3f80 Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Sat, 24 Apr 2021 00:00:00 +0000
Subject: [PATCH] Get rid of `mod.rs` files.

Since Rust 2018 [1] it is no longer required to move module code to
`mod.rs` when submodules are added. This eliminates common problem of
having multiple buffers named `mod.rs` in editor.

[1] https://doc.rust-lang.org/edition-guide/rust-2018/module-system/path-clarity.html#no-more-modrs
---
 src/{configure/mod.rs => configure.rs}   | 0
 src/{imap/mod.rs => imap.rs}             | 0
 src/{provider/mod.rs => provider.rs}     | 0
 src/{securejoin/mod.rs => securejoin.rs} | 0
 src/{smtp/mod.rs => smtp.rs}             | 0
 src/{sql/mod.rs => sql.rs}               | 2 +-
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename src/{configure/mod.rs => configure.rs} (100%)
 rename src/{imap/mod.rs => imap.rs} (100%)
 rename src/{provider/mod.rs => provider.rs} (100%)
 rename src/{securejoin/mod.rs => securejoin.rs} (100%)
 rename src/{smtp/mod.rs => smtp.rs} (100%)
 rename src/{sql/mod.rs => sql.rs} (99%)

diff --git a/src/configure/mod.rs b/src/configure.rs
similarity index 100%
rename from src/configure/mod.rs
rename to src/configure.rs
diff --git a/src/imap/mod.rs b/src/imap.rs
similarity index 100%
rename from src/imap/mod.rs
rename to src/imap.rs
diff --git a/src/provider/mod.rs b/src/provider.rs
similarity index 100%
rename from src/provider/mod.rs
rename to src/provider.rs
diff --git a/src/securejoin/mod.rs b/src/securejoin.rs
similarity index 100%
rename from src/securejoin/mod.rs
rename to src/securejoin.rs
diff --git a/src/smtp/mod.rs b/src/smtp.rs
similarity index 100%
rename from src/smtp/mod.rs
rename to src/smtp.rs
diff --git a/src/sql/mod.rs b/src/sql.rs
similarity index 99%
rename from src/sql/mod.rs
rename to src/sql.rs
index df389e6b3..822fded24 100644
--- a/src/sql/mod.rs
+++ b/src/sql.rs
@@ -755,7 +755,7 @@ mod test {
         let t = TestContext::new().await;
 
         let avatar_src = t.dir.path().join("avatar.png");
-        let avatar_bytes = include_bytes!("../../test-data/image/avatar64x64.png");
+        let avatar_bytes = include_bytes!("../test-data/image/avatar64x64.png");
         File::create(&avatar_src)
             .await
             .unwrap()