summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2023-04-05 19:06:43 +0300
committerLars Wirzenius <liw@liw.fi>2023-04-08 16:56:30 +0300
commitc8f96271fd18dd38c6112a01380a3246ee6b871a (patch)
tree4dd0a30c4eb098f43f69bcffc986dd77adf21d2b
parent014c3ff3d957a3012278e4f11a81404c873738e9 (diff)
downloadsubplot-c8f96271fd18dd38c6112a01380a3246ee6b871a.tar.gz
chore: drop Pandoc stuff as a Rust depenendency
Sponsored-by: author
-rw-r--r--Cargo.lock72
-rw-r--r--Cargo.toml10
-rw-r--r--src/lib.rs7
3 files changed, 25 insertions, 64 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 9c2eec0..577d838 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -242,12 +242,6 @@ dependencies = [
]
[[package]]
-name = "either"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
-
-[[package]]
name = "env_logger"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -486,6 +480,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
[[package]]
+name = "html-escape"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
+dependencies = [
+ "utf8-width",
+]
+
+[[package]]
name = "humansize"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -557,15 +560,6 @@ dependencies = [
]
[[package]]
-name = "itertools"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
-dependencies = [
- "either",
-]
-
-[[package]]
name = "itoa"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -584,6 +578,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]]
+name = "line-col"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e69cdf6b85b5c8dce514f694089a2cf8b1a702f6cd28607bcb3cf296c9778db"
+
+[[package]]
name = "linked-hash-map"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -699,37 +699,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
-name = "pandoc"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb8469d27ed9fd7925629076a3675fea964c3f44c49662bdf549a8b7ddf0820"
-dependencies = [
- "itertools",
-]
-
-[[package]]
-name = "pandoc_ast"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b960d9b78f94feb2a43ace4dda1d2b924a0d5a0639f399620fb54fe2943a9e7"
-dependencies = [
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "pandoc_ast"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b89d3de9c9dd508abc39cd5c0ab022b49ef5b18145ce30abacf00333bba1a74"
-dependencies = [
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
name = "percent-encoding"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1139,11 +1108,10 @@ dependencies = [
"env_logger",
"file_diff",
"git-testament",
+ "html-escape",
"lazy_static",
+ "line-col",
"log",
- "pandoc",
- "pandoc_ast 0.7.3",
- "pandoc_ast 0.8.4",
"pikchr",
"pulldown-cmark",
"regex",
@@ -1501,6 +1469,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
+name = "utf8-width"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
+
+[[package]]
name = "valuable"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 6aa3727..256fa47 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,11 +17,6 @@ default-run = "subplot"
[workspace]
members = ["subplotlib", "subplotlib-derive", "subplot-build", "examples/seq"]
-[features]
-default = ["ast_07"]
-ast_07 = ["pandoc_ast_07"]
-ast_08 = ["pandoc_ast_08"]
-
[dependencies]
anyhow = "1"
base64 = "0.13.0"
@@ -30,9 +25,6 @@ file_diff = "1"
git-testament = "0.2"
lazy_static = "1"
log = "0.4.16"
-pandoc = "0.8.0"
-pandoc_ast_07 = { package = "pandoc_ast", version = "0.7", optional = true }
-pandoc_ast_08 = { package = "pandoc_ast", version = "0.8", optional = true }
pikchr = "0.1"
pulldown-cmark = "0.9.0"
regex = "1"
@@ -46,6 +38,8 @@ tempfile-fast = "0.3.1"
thiserror = "1"
time = { version = "0.3", features = ["formatting", "macros"] }
env_logger = "0.9.0"
+html-escape = "0.2.13"
+line-col = "0.2.1"
[dependencies.tera]
version = "1"
diff --git a/src/lib.rs b/src/lib.rs
index 194db38..9c9de7d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,13 +6,6 @@
#![deny(missing_docs)]
-// Handle the multiple pandoc_ast versions
-
-#[cfg(feature = "pandoc_ast_07")]
-extern crate pandoc_ast_07 as pandoc_ast;
-#[cfg(feature = "pandoc_ast_08")]
-extern crate pandoc_ast_08 as pandoc_ast;
-
mod error;
pub use error::SubplotError;
pub use error::Warning;