From 8f10daf746fa9bb547ddd5eda49174ded9191b4f Mon Sep 17 00:00:00 2001 From: Huck Boles Date: Mon, 15 May 2023 19:49:20 -0500 Subject: [PATCH] removed pretty assertions --- Cargo.lock | 67 ++----------------- Cargo.toml | 1 - benches/build_metafile.rs | 2 +- files/test_site/source/benchmark.meta | 41 ------------ .../source/{unit_tests => }/default.meta | 2 + 5 files changed, 9 insertions(+), 104 deletions(-) delete mode 100644 files/test_site/source/benchmark.meta rename files/test_site/source/{unit_tests => }/default.meta (75%) diff --git a/Cargo.lock b/Cargo.lock index 2d32459..b801938 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -215,7 +215,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -350,22 +350,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - [[package]] name = "digest" version = "0.10.6" @@ -595,7 +579,6 @@ dependencies = [ "pandoc", "pest", "pest_derive", - "pretty_assertions", ] [[package]] @@ -653,15 +636,6 @@ version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - [[package]] name = "owo-colors" version = "1.3.0" @@ -707,7 +681,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -749,18 +723,6 @@ dependencies = [ "plotters-backend", ] -[[package]] -name = "pretty_assertions" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" -dependencies = [ - "ctor", - "diff", - "output_vt100", - "yansi", -] - [[package]] name = "proc-macro2" version = "1.0.57" @@ -874,7 +836,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -905,17 +867,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.16" @@ -950,7 +901,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -1024,7 +975,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn", "wasm-bindgen-shared", ] @@ -1046,7 +997,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1163,9 +1114,3 @@ name = "windows_x86_64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/Cargo.toml b/Cargo.toml index c735635..9c3f122 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,6 @@ pest = "2" pest_derive = "2" [dev-dependencies] -pretty_assertions = "1" criterion = "0.4" [[bench]] diff --git a/benches/build_metafile.rs b/benches/build_metafile.rs index c8051b2..8c16999 100644 --- a/benches/build_metafile.rs +++ b/benches/build_metafile.rs @@ -1,7 +1,7 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion}; pub fn build_file_benchmark(c: &mut Criterion) { - let dir = std::path::PathBuf::from("files/site") + let dir = std::path::PathBuf::from("files/benchmark_site") .canonicalize() .unwrap(); diff --git a/files/test_site/source/benchmark.meta b/files/test_site/source/benchmark.meta deleted file mode 100644 index 3f0eda6..0000000 --- a/files/test_site/source/benchmark.meta +++ /dev/null @@ -1,41 +0,0 @@ -#{ filetype = 'html' } - -${ - var = 'variables' - inline = 'inline variables' - bench_variable = 'this is a really long variable that contains multiple lines - and other interesting features to test how well metaforge deals long variables - \t this is a list: - - to - - see - - how - - flexible - - variables - - are - pretty cool!' - -} - -@{ - single = ['single value arrays'] - bench.footer.array = ['1','2','3','4','5','6','7','8','9','10'] -} - -&{ - body = 'bench' -} - -# THIS IS THE BENCHMARK FILE FOR METAFORGE - -*it has __${var}* and @{single}__ - -

Some inline html with ${inline}

- --{comments before a line} ### Other Tests - -a bunch of symbols !@#$%^&*())_ - -code blocks: -``` -let f = "foo" -``` diff --git a/files/test_site/source/unit_tests/default.meta b/files/test_site/source/default.meta similarity index 75% rename from files/test_site/source/unit_tests/default.meta rename to files/test_site/source/default.meta index 473421f..c83b564 100644 --- a/files/test_site/source/unit_tests/default.meta +++ b/files/test_site/source/default.meta @@ -1,6 +1,7 @@ ${ override = 'BAD' global = 'GOOD' + local_global = 'BAD' } &{ @@ -9,4 +10,5 @@ ${ test.default = 'bad' test.blank = 'bad' test.global = 'good' + test.local_global = 'good' } -- 2.45.2