Merge pull request #30 from getslash/updates

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Rotem Yaari <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "mailboxer"
 version = "2.0.1"
 

src/pagination.rs

@@ -9,7 +9,7 @@ pub struct Pagination {
 
 impl Pagination {
     pub fn get_page(&self) -> usize {
-        max(1, self.page.unwrap_or(1) as usize)
+        max(1, self.page.unwrap_or(1))
     }
 
     pub fn limit(&self) -> i64 {

src/smtp.rs

@@ -316,6 +316,11 @@ fn read_to_end_of_data(stream: &mut dyn BufRead) -> Result<String, Error> {
     }
 }
 
+fn load_tls_identity() -> Identity {
+    Identity::from_pkcs12(include_bytes!("../tls_identity.pfx"), "mailboxer")
+        .expect("Unable to load identity")
+}
+
 #[cfg(test)]
 mod tests {
 
@@ -365,8 +370,3 @@ mod tests {
         );
     }
 }
-
-fn load_tls_identity() -> Identity {
-    Identity::from_pkcs12(include_bytes!("../tls_identity.pfx"), "mailboxer")
-        .expect("Unable to load identity")
-}