Replace docker-compose calls with docker compose

Author: GuillaumeGomez

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
         run: |
           cp .env.sample .env
           mkdir -p ${DOCSRS_PREFIX}/public-html
-          docker-compose up -d db
+          docker compose up -d db
           # Give the database enough time to start up
           sleep 5
           # Make sure the database is actually working
@@ -69,7 +69,7 @@ jobs:
             --target-version 0
 
       - name: Clean up the database
-        run: docker-compose down --volumes
+        run: docker compose down --volumes
 
   test:
     env:
@@ -94,7 +94,7 @@ jobs:
         run: |
           cp .env.sample .env
           mkdir -p ${DOCSRS_PREFIX}/public-html
-          docker-compose up -d db s3
+          docker compose up -d db s3
           # Give the database enough time to start up
           sleep 5
           # Make sure the database is actually working
@@ -111,7 +111,7 @@ jobs:
           cargo test --locked -- --ignored --test-threads=1
 
       - name: Clean up the database
-        run: docker-compose down --volumes
+        run: docker compose down --volumes
 
   GUI_test:
     runs-on: ubuntu-latest
@@ -131,7 +131,7 @@ jobs:
         run: |
           cp .env.sample .env
           mkdir -p ${DOCSRS_PREFIX}/public-html
-          docker-compose up -d db s3
+          docker compose up -d db s3
           # Give the database enough time to start up
           sleep 5
           # Make sure the database is actually working
@@ -141,7 +141,7 @@ jobs:
         run: ./dockerfiles/run-gui-tests.sh
 
       - name: Clean up the database
-        run: docker-compose down --volumes
+        run: docker compose down --volumes
 
   fmt:
     name: Rustfmt

dockerfiles/run-gui-tests.sh

@@ -3,9 +3,9 @@
 set -e
 
 # Just in case it's running, we stop the web server.
-docker-compose stop web
+docker compose stop web
 
-docker-compose up -d db s3
+docker compose up -d db s3
 
 # If we have a .env file, we need to temporarily move it so
 # it doesn't make sqlx fail compilation.
@@ -36,6 +36,6 @@ cargo run -- start-web-server &
 SERVER_PID=$!
 
 # status="docker run . -v `pwd`:/build/out:ro gui_tests"
-docker-compose run gui_tests
+docker compose run gui_tests
 status=$?
 exit $status

src/web/page/templates.rs

@@ -216,24 +216,24 @@ pub mod filters {
         Ok(unindented)
     }
 
-    pub fn fas(value: &str, fw: bool, spin: bool, extra: &str) -> rinja::Result<String> {
-        IconType::Strong.render(value, fw, spin, extra)
+    pub fn fas(value: &str, fw: bool, spin: bool, extra: &str) -> rinja::Result<Safe<String>> {
+        IconType::Strong.render(value, fw, spin, extra).map(Safe)
     }
 
-    pub fn far(value: &str, fw: bool, spin: bool, extra: &str) -> rinja::Result<String> {
-        IconType::Regular.render(value, fw, spin, extra)
+    pub fn far(value: &str, fw: bool, spin: bool, extra: &str) -> rinja::Result<Safe<String>> {
+        IconType::Regular.render(value, fw, spin, extra).map(Safe)
     }
 
-    pub fn fab(value: &str, fw: bool, spin: bool, extra: &str) -> rinja::Result<String> {
-        IconType::Brand.render(value, fw, spin, extra)
+    pub fn fab(value: &str, fw: bool, spin: bool, extra: &str) -> rinja::Result<Safe<String>> {
+        IconType::Brand.render(value, fw, spin, extra).map(Safe)
     }
 
-    pub fn highlight(code: impl std::fmt::Display, lang: &str) -> rinja::Result<String> {
+    pub fn highlight(code: impl std::fmt::Display, lang: &str) -> rinja::Result<Safe<String>> {
         let highlighted_code = crate::web::highlight::with_lang(Some(lang), &code.to_string());
-        Ok(format!(
+        Ok(Safe(format!(
             "<pre><code>{}</code></pre>",
             highlighted_code
-        ))
+        )))
     }
 
     pub fn slugify<T: AsRef<str>>(code: T) -> rinja::Result<String> {