Merge pull request #3502 from BlackDex/fix-trailing-slash

Use Rocket `v0.5` branch to fix endpoints

Cargo.toml

@@ -57,7 +57,7 @@ num-derive = "0.3.3"
 # Web framework
 rocket = { version = "0.5.0-rc.3", features = ["tls", "json"], default-features = false }
 # rocket_ws = { version ="0.1.0-rc.3" }
-rocket_ws = { git = 'https://github.com/SergioBenitez/Rocket', rev = "9b0564ed27f90686b333337d9f6ed76484a84b27" }
+rocket_ws = { git = 'https://github.com/SergioBenitez/Rocket', rev = "be496682c209e008215d81ca9dd396617c4f810a" } # v0.5 branch
 
 # WebSockets libraries
 tokio-tungstenite = "0.18.0"
@@ -71,7 +71,7 @@ futures = "0.3.28"
 tokio = { version = "1.28.0", features = ["rt-multi-thread", "fs", "io-util", "parking_lot", "time", "signal"] }
 
 # A generic serialization/deserialization framework
-serde = { version = "1.0.160", features = ["derive"] }
+serde = { version = "1.0.162", features = ["derive"] }
 serde_json = "1.0.96"
 
 # A safe, extensible ORM and Query builder
@@ -92,7 +92,7 @@ uuid = { version = "1.3.2", features = ["v4"] }
 # Date and time libraries
 chrono = { version = "0.4.24", features = ["clock", "serde"], default-features = false }
 chrono-tz = "0.8.2"
-time = "0.3.20"
+time = "0.3.21"
 
 # Job scheduler
 job_scheduler_ng = "2.0.4"
@@ -164,8 +164,8 @@ argon2 = "0.5.0"
 rpassword = "7.2.0"
 
 [patch.crates-io]
-rocket = { git = 'https://github.com/SergioBenitez/Rocket', rev = '9b0564ed27f90686b333337d9f6ed76484a84b27' }
-# rocket_ws = { git = 'https://github.com/SergioBenitez/Rocket', rev = '9b0564ed27f90686b333337d9f6ed76484a84b27' }
+rocket = { git = 'https://github.com/SergioBenitez/Rocket', rev = 'be496682c209e008215d81ca9dd396617c4f810a' } # v0.5 branch
+# rocket_ws = { git = 'https://github.com/SergioBenitez/Rocket', rev = 'be496682c209e008215d81ca9dd396617c4f810a' } # v0.5 branch
 
 # Strip debuginfo from the release builds
 # Also enable thin LTO for some optimizations

src/util.rs

@@ -248,7 +248,7 @@ impl Fairing for BetterLogging {
         if self.0 {
             info!(target: "routes", "Routes loaded:");
             let mut routes: Vec<_> = rocket.routes().collect();
-            routes.sort_by_key(|r| r.uri.path().as_str());
+            routes.sort_by_key(|r| r.uri.path());
             for route in routes {
                 if route.rank < 0 {
                     info!(target: "routes", "{:<6} {}", route.method, route.uri);