Auto merge of #3926 - Turbo87:cio-markdown, r=jtgeibel

Extract `cio_markdown` subpackage

This allows us to isolate our markdown rendering code in a dedicated package, which could potentially have a positive effect on the compile times of the full project. It also means we can iterate on this part of the code independent from the other parts (see #3861 or #3297), and with a well-defined API interface.

Author: bors

.github/workflows/ci.yml

@@ -218,11 +218,11 @@ jobs:
 
       - name: Run tests (with coverage report)
         if: matrix.rust == 'stable'
-        run: cargo tarpaulin --avoid-cfg-tarpaulin
+        run: cargo tarpaulin --avoid-cfg-tarpaulin --workspace
 
       - name: Run tests
         if: matrix.rust != 'stable'
-        run: cargo test
+        run: cargo test --workspace
 
       - name: Prune unnecessary cache
         run: script/ci/prune-cache.sh

Cargo.lock

@@ -30,13 +30,12 @@ rustdoc-args = [
 ]
 
 [dependencies]
-ammonia = "3.0.0"
 anyhow = "1.0"
 base64 = "0.13"
 cargo-registry-s3 = { path = "src/s3", version = "0.2.0" }
 chrono = { version = "0.4.0", features = ["serde"] }
+cio_markdown = { path = "src/markdown" }
 clap = "=3.0.0-beta.4"
-comrak = { version = "0.10.1", default-features = false }
 
 conduit = "0.9.0-alpha.5"
 conduit-conditional-get = "0.9.0-alpha.3"
@@ -61,7 +60,6 @@ futures-util = "0.3"
 git2 = "0.13.0"
 handlebars = "4.1.3"
 hex = "0.4"
-htmlescape = "0.3.1"
 http = "0.2"
 hyper = { version = "0.14", features = ["client", "http1"] }
 indexmap = { version = "1.0.2", features = ["serde-1"] }

Cargo.toml

@@ -1,13 +1,13 @@
 use crate::{
     config, db,
     models::Version,
-    render::readme_to_html,
     schema::{crates, readme_renderings, versions},
     uploaders::Uploader,
 };
 use std::{io::Read, path::Path, sync::Arc, thread};
 
 use chrono::{TimeZone, Utc};
+use cio_markdown::readme_to_html;
 use clap::Clap;
 use diesel::{dsl::any, prelude::*};
 use flate2::read::GzDecoder;

src/admin/render_readmes.rs

@@ -0,0 +1,18 @@
+[package]
+
+name = "cio_markdown"
+version = "0.0.0"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/rust-lang/crates.io"
+description = "crates.io markdown renderer"
+edition = "2018"
+resolver = "2"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+ammonia = "3.1.2"
+comrak = { version = "0.10.1", default-features = false }
+htmlescape = "0.3.1"
+url = "2.2.2"