From 750dedb7521338790ef5ae3451183cbd2c0a4712 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 3 Jun 2021 00:49:22 +0200
Subject: [PATCH 1/3] Switch x3 to r3 cert

---
 src/builder.rs | 4 ++--
 src/lib.rs     | 2 +-
 src/locator.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/builder.rs b/src/builder.rs
index 811c3f1..3c80f3a 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -6,7 +6,7 @@ use crate::resources::{
   Resource, ServeCustom, ServePhp, ServeRedir, ServeService, ServeStatic, StoredDirectory,
   SystemdSocketService, User, UserForDomain, WordpressPlugin, WordpressTranslation,
 };
-use crate::static_files::LETS_ENCRYPT_X3_CROSS_SIGNED;
+use crate::static_files::LETS_ENCRYPT_R3_CROSS_SIGNED;
 use crate::storage::SimpleStorage;
 use crate::storage::Storage;
 use crate::symbols::acme::Cert as CertSymbol;
@@ -676,7 +676,7 @@ impl ImplementationBuilder<AcmeRootCert> for DefaultBuilder {
     target: &<AcmeRootCert as Resource>::Artifact,
     (): <Self::Prerequisites as ToArtifact>::Artifact,
   ) -> Self::Implementation {
-    FileSymbol::new(target.clone().into(), LETS_ENCRYPT_X3_CROSS_SIGNED)
+    FileSymbol::new(target.clone().into(), LETS_ENCRYPT_R3_CROSS_SIGNED)
   }
 }
 
diff --git a/src/lib.rs b/src/lib.rs
index f5f883d..dc73e82 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -22,7 +22,7 @@
   clippy::future_not_send,
   clippy::missing_errors_doc,
   clippy::module_name_repetitions,
-  rustdoc,
+  rustdoc::all,
   missing_docs,
   missing_copy_implementations
 )]
diff --git a/src/locator.rs b/src/locator.rs
index 739c8c3..31e8aea 100644
--- a/src/locator.rs
+++ b/src/locator.rs
@@ -243,7 +243,7 @@ impl<P: Policy> ResourceLocator<AcmeRootCert> for DefaultLocator<P> {
     let acme_user = P::acme_user();
     let home = P::user_home(acme_user);
     (
-      PathArtifact::from(home.join("lets_encrypt_x3_cross_signed.pem")),
+      PathArtifact::from(home.join("lets_encrypt_r3_cross_signed.pem")),
       Dir(home),
     )
   }

From 9694ed01385d887048df2dae1c7e1b18dc4a9486 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 3 Jun 2021 01:06:10 +0200
Subject: [PATCH 2/3] Stable test

---
 src/symbols/git/checkout.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/symbols/git/checkout.rs b/src/symbols/git/checkout.rs
index 14593ba..bb2f867 100644
--- a/src/symbols/git/checkout.rs
+++ b/src/symbols/git/checkout.rs
@@ -136,14 +136,20 @@ mod test {
     let start = Instant::now();
     assert!(run(checkout.target_reached()).unwrap());
     let end = Instant::now();
+    let mut args = c.args.into_inner();
+    let first_two_args = &mut args[0..2];
+    first_two_args.sort_unstable();
     assert_eq!(
-      c.args.into_inner(),
+      first_two_args,
       [
         ["-C", "target", "fetch", "source", "branch"],
         ["-C", "target", "rev-list", "-1", "HEAD"],
-        ["-C", "target", "rev-list", "-1", "FETCH_HEAD"]
       ]
     );
+    drop(first_two_args);
+    assert_eq!(args[2],
+        ["-C", "target", "rev-list", "-1", "FETCH_HEAD"]);
+
     assert!((end - start).as_millis() >= 100);
     assert!((end - start).as_millis() < 150);
   }

From 1a248f1dc1cb94b5009f29951d63cd1e518250e8 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 3 Jun 2021 21:15:56 +0200
Subject: [PATCH 3/3] Bump tokio dependency

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7c9a897..e7a0204 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ users = "0.11.0"
 regex = "1.0.1"
 futures = "0.3"
 async-trait = "0.1"
-tokio = { version = "0.3", features = ["rt", "process", "io-util", "macros", "sync"] }
+tokio = { version = "1.6.1", features = ["rt", "process", "io-util", "macros", "sync"] }
 once_cell = "1.4"
 
 [dev-dependencies]