From 9955a3acf09ea9d61db018167122d8e3620b42f3 Mon Sep 17 00:00:00 2001 From: Vince Pike Date: Thu, 10 Mar 2022 15:20:47 -0500 Subject: [PATCH] Switch to TOML Format --- CHANGELOG.md | 11 ++ Cargo.lock | 124 +++++++++----------- README.md | 2 +- docs/en/docs/installation.md | 2 +- examples/Cargo.toml | 2 +- sailfish-compiler/Cargo.toml | 2 +- sailfish-macros/Cargo.toml | 4 +- sailfish-tests/fuzzing-tests/Cargo.toml | 4 +- sailfish-tests/integration-tests/Cargo.toml | 2 +- sailfish/Cargo.toml | 4 +- 10 files changed, 77 insertions(+), 80 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a10bfaf..63af92c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ + +## [v0.4.0](https://github.com/rust-sailfish/sailfish/compare/v0.3.4...v0.4.0) (2022-03-10) + +## Fix + +* Fix some issues pointing to the wrong documentation links + +##Breaking Change + +* Changed format to .TOML instead of .yaml to better match what Rust uses. + ## [v0.3.4](https://github.com/rust-sailfish/sailfish/compare/v0.3.3...v0.3.4) (2021-02-13) diff --git a/Cargo.lock b/Cargo.lock index 29988b5..476ddd2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "cfg-if" @@ -25,9 +25,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "ctor" -version = "0.1.14" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6b25ee9ac1995c54d7adb2eff8cfffb7260bc774fb63c601ec65467f43cd9d" +checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" dependencies = [ "quote", "syn", @@ -41,9 +41,9 @@ checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" [[package]] name = "filetime" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if", "libc", @@ -68,7 +68,7 @@ dependencies = [ [[package]] name = "integration-tests" -version = "0.3.4" +version = "0.4.0" dependencies = [ "pretty_assertions", "sailfish", @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] name = "itoap" @@ -90,35 +90,29 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "libc" -version = "0.2.82" +version = "0.2.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" - -[[package]] -name = "linked-hash-map" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" +checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" [[package]] name = "memchr" -version = "2.3.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "once_cell" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "output_vt100" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" dependencies = [ "winapi", ] @@ -137,40 +131,40 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.26" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid", ] [[package]] name = "quote" -version = "1.0.6" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.2.4" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" +checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" dependencies = [ "bitflags", ] [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" [[package]] name = "sailfish" -version = "0.3.4" +version = "0.4.0" dependencies = [ "itoap", "ryu", @@ -182,7 +176,7 @@ dependencies = [ [[package]] name = "sailfish-compiler" -version = "0.3.4" +version = "0.4.0" dependencies = [ "filetime", "home", @@ -190,13 +184,14 @@ dependencies = [ "pretty_assertions", "proc-macro2", "quote", + "serde", "syn", - "yaml-rust", + "toml", ] [[package]] name = "sailfish-macros" -version = "0.3.4" +version = "0.4.0" dependencies = [ "proc-macro2", "sailfish-compiler", @@ -204,18 +199,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.111" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.111" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -224,9 +219,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.53" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993948e75b189211a9b31a7528f950c6adc21f9720b6438ff80a7fa2f864cea2" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" dependencies = [ "itoa", "ryu", @@ -235,9 +230,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.68" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ce15dd3ed8aa2f8eeac4716d6ef5ab58b6b9256db41d7e1a0224c2788e8fd87" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", @@ -246,30 +241,30 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] [[package]] name = "toml" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "serde", ] [[package]] name = "trybuild" -version = "1.0.28" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3183158b2c8170db33b8b3a90ddc7b5f380d15b50794d22c1fa9c61b47249" +checksum = "2d60539445867cdd9680b2bfe2d0428f1814b7d5c9652f09d8d3eae9d19308db" dependencies = [ "glob", - "lazy_static", + "once_cell", "serde", "serde_json", "termcolor", @@ -278,21 +273,21 @@ dependencies = [ [[package]] name = "unicode-xid" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "winapi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ "winapi-i686-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu", @@ -318,12 +313,3 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "yaml-rust" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" -dependencies = [ - "linked-hash-map", -] diff --git a/README.md b/README.md index f2c418f..a5cf5a1 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Dependencies: ```toml [dependencies] -sailfish = "0.3.4" +sailfish = "0.4.0" ``` Template file (templates/hello.stpl): diff --git a/docs/en/docs/installation.md b/docs/en/docs/installation.md index 9ae387b..844c33b 100644 --- a/docs/en/docs/installation.md +++ b/docs/en/docs/installation.md @@ -4,7 +4,7 @@ In order to use sailfish templates, you have add two dependencies in your `Cargo ``` toml [dependencies] -sailfish = "0.3.4" +sailfish = "0.4.0" ``` ## Feature Flags diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 7321d35..9519f58 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sailfish-examples" -version = "0.3.4" +version = "0.4.0" authors = ["Ryohei Machida "] edition = "2018" publish = false diff --git a/sailfish-compiler/Cargo.toml b/sailfish-compiler/Cargo.toml index 68a2d5b..89289f0 100644 --- a/sailfish-compiler/Cargo.toml +++ b/sailfish-compiler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sailfish-compiler" -version = "0.3.4" +version = "0.4.0" authors = ["Ryohei Machida "] description = "Simple, small, and extremely fast template engine for Rust" homepage = "https://github.com/rust-sailfish/sailfish" diff --git a/sailfish-macros/Cargo.toml b/sailfish-macros/Cargo.toml index 6f7f426..1779ac6 100644 --- a/sailfish-macros/Cargo.toml +++ b/sailfish-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sailfish-macros" -version = "0.3.4" +version = "0.4.0" authors = ["Ryohei Machida "] description = "Simple, small, and extremely fast template engine for Rust" homepage = "https://github.com/rust-sailfish/sailfish" @@ -30,6 +30,6 @@ proc-macro2 = "1.0.11" [dependencies.sailfish-compiler] path = "../sailfish-compiler" -version = "0.3.4" +version = "0.4.0" default-features = false features = ["procmacro"] diff --git a/sailfish-tests/fuzzing-tests/Cargo.toml b/sailfish-tests/fuzzing-tests/Cargo.toml index ec9b875..6dbe25c 100644 --- a/sailfish-tests/fuzzing-tests/Cargo.toml +++ b/sailfish-tests/fuzzing-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fuzzing-tests" -version = "0.3.4" +version = "0.4.0" authors = ["Ryohei Machida "] edition = "2018" publish = false @@ -8,6 +8,6 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -afl = "0.8.0" +afl = "0.12.2" sailfish = { path = "../../sailfish", default-features = false } sailfish-compiler = { path = "../../sailfish-compiler", default-features = false } diff --git a/sailfish-tests/integration-tests/Cargo.toml b/sailfish-tests/integration-tests/Cargo.toml index 4775a67..93dad63 100644 --- a/sailfish-tests/integration-tests/Cargo.toml +++ b/sailfish-tests/integration-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "integration-tests" -version = "0.3.4" +version = "0.4.0" authors = ["Ryohei Machida "] edition = "2018" publish = false diff --git a/sailfish/Cargo.toml b/sailfish/Cargo.toml index 7b5f389..301cca6 100644 --- a/sailfish/Cargo.toml +++ b/sailfish/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sailfish" -version = "0.3.4" +version = "0.4.0" authors = ["Ryohei Machida "] description = "Simple, small, and extremely fast template engine for Rust" homepage = "https://github.com/rust-sailfish/sailfish" @@ -29,7 +29,7 @@ serde_json = { version = "1.0.53", optional = true } [dependencies.sailfish-macros] path = "../sailfish-macros" -version = "0.3.4" +version = "0.4.0" optional = true [build-dependencies]