Skip to content

Extract cio_markdown subpackage #3926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2021
Merged

Extract cio_markdown subpackage #3926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71b1627
CI: Ensure that tests from all workspace projects are run
Turbo87 Sep 16, 2021
f9871c2
Extract `cio_markdown` subpackage
Turbo87 Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 11 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion src/admin/render_readmes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
18 changes: 18 additions & 0 deletions src/markdown/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Loading