Reorder Cargo.toml (and do a soft upgrade). (#1210)

This PR reorders the dependency list in Cargo.toml alphabetically. It also
does a soft cargo update.

Cargo.toml

@@ -27,6 +27,8 @@ basic-cookies = { version = "^0.1", optional = true }
 bytes = "1"
 chrono = { version = "^0.4", features = ["serde"] }
 clap = "^2.33"
+cryptoki = { version = "^0.3", optional = true }
+cryptoki-sys = { version = "=0.1.4", optional = true } # pin cryptoki-sys because of compilation issues on various systems
 fern = { version = "^0.5", features = ["syslog-4"] }
 futures = "^0.3"
 futures-util = "^0.3"
@@ -35,44 +37,32 @@ hex = "^0.4"
 hyper = { version = "^0.14", features = ["server"] }
 intervaltree = "0.2.6"
 jmespatch = { version = "^0.3", features = ["sync"], optional = true }
-kmip = { version = "0.4.2", package = "kmip-protocol", features = [
-    "tls-with-openssl",
-], optional = true }
+kmip = { version = "0.4.2", package = "kmip-protocol", features = [ "tls-with-openssl" ], optional = true }
 kvx = { version = "0.9.3", features = ["macros"] }
 libflate = "^1"
 log = "^0.4"
 once_cell = { version = "^1.7.2", optional = true }
 openidconnect = { version = "^2.0.0", optional = true, default_features = false }
 openssl = { version = "^0.10", features = ["v110"] }
 oso = { version = "^0.12", optional = true, default_features = false }
-cryptoki = { version = "^0.3", optional = true }
-cryptoki-sys = { version = "=0.1.4", optional = true } # pin cryptoki-sys because of compilation issues on various systems
 r2d2 = { version = "0.8.9", optional = true }
 rand = "^0.8"
-regex = { version = "1.5.5", optional = true, default_features = false, features = [
-    "std",
-] }
+regex = { version = "1.5.5", optional = true, default_features = false, features = [ "std" ] }
 reqwest = { version = "0.11", features = ["json"] }
 rpassword = { version = "^5.0", optional = true }
 #rpki = { version = "0.18.0", features = ["ca", "compat", "rrdp"] }
 rpki = { git = "https://github.com/nLnetLabs/rpki-rs", features = [ "ca", "compat", "rrdp" ] }
+rustls-pemfile = "1.0.4"
 scrypt = { version = "^0.6", optional = true, default-features = false }
 serde = { version = "^1.0", features = ["derive", "rc"] }
 serde_json = "^1.0"
-tokio = { version = "1", features = [
-    "macros",
-    "rt",
-    "rt-multi-thread",
-    "signal",
-    "time",
-] }
+tokio = { version = "1", features = [ "macros", "rt", "rt-multi-thread", "signal", "time" ] }
 tokio-rustls = "0.24.1"
-rustls-pemfile = "1.0.4" # needed to parse pem files for use in our HTTPS listener
 toml = "^0.5"
 unicode-normalization = { version = "^0.1", optional = true }
 url = { version = "2.3.1", features = ["serde"] }
 urlparse = { version = "^0.7", optional = true }
-uuid = { version = "1.1", features = ["v4"] } # keep this in sync with rpki-rs
+uuid = { version = "1.1", features = ["v4"] }
 
 # Disable compiler optimizations for the pkcs11 crate because otherwise with a release build the
 # `pReserved = ptr::null_mut()` assignment done by `CK_C_INITIALIZE_ARGS::default()` appears to be optimized out. This