diff options
Diffstat (limited to '')
| -rw-r--r-- | Cargo.lock | 14 | ||||
| -rw-r--r-- | README.md | 17 | ||||
| -rw-r--r-- | abnf_to_pest/Cargo.toml | 3 | ||||
| -rw-r--r-- | abnf_to_pest/src/lib.rs | 2 | ||||
| -rw-r--r-- | dhall/Cargo.toml | 5 | ||||
| -rw-r--r-- | dhall/src/lib.rs | 2 | ||||
| -rw-r--r-- | dhall_proc_macros/Cargo.toml | 3 | ||||
| -rw-r--r-- | dhall_proc_macros/src/lib.rs | 2 | ||||
| -rw-r--r-- | release.toml | 10 | ||||
| -rw-r--r-- | serde_dhall/Cargo.toml | 7 | ||||
| -rw-r--r-- | serde_dhall/release.toml | 35 | ||||
| -rw-r--r-- | serde_dhall/src/lib.rs | 2 | ||||
| -rw-r--r-- | serde_dhall/src/options.rs | 4 |
13 files changed, 85 insertions, 21 deletions
@@ -10,7 +10,7 @@ dependencies = [ [[package]] name = "abnf_to_pest" -version = "0.2.0" +version = "0.5.0" dependencies = [ "abnf 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -136,9 +136,9 @@ dependencies = [ [[package]] name = "dhall" -version = "0.4.0" +version = "0.5.0" dependencies = [ - "abnf_to_pest 0.2.0", + "abnf_to_pest 0.5.0", "annotate-snippets 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -161,7 +161,7 @@ dependencies = [ [[package]] name = "dhall_proc_macros" -version = "0.4.0" +version = "0.5.0" dependencies = [ "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1037,10 +1037,10 @@ dependencies = [ [[package]] name = "serde_dhall" -version = "0.4.0" +version = "0.5.0" dependencies = [ - "dhall 0.4.0", - "dhall_proc_macros 0.4.0", + "dhall 0.5.0", + "dhall_proc_macros 0.5.0", "doc-comment 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", @@ -46,7 +46,7 @@ Add this to your `Cargo.toml`: ```toml [dependencies] -serde_dhall = "0.4.0" +serde_dhall = "0.5.0" ``` Reading Dhall files is easy and leverages the wonderful [`serde`](https://crates.io/crates/serde) library. @@ -167,9 +167,16 @@ same name as the corresponding test. ## Changelog -#### [???] +#### [Unreleased] -- Breaking change: reworked most of the `serde_dhall` api +#### [0.5.0] - 2020-04-05 + +- Add `serde_dhall::from_file` to read a Dhall file directly. +- BREAKING CHANGE: reworked most of the `serde_dhall` API + + You need to replace uses of `from_str(s)` with `from_str(s).parse()`. The + various type annotation methods have been removed; use instead the methods on + the `Deserializer` struct. #### [0.4.0] @@ -202,6 +209,10 @@ same name as the corresponding test. - Initial release +<!-- next-url --> +[Unreleased]: https://github.com/Nadrieril/dhall-rust/compare/serde_dhall-v0.5.0...HEAD +[0.5.0]: https://github.com/Nadrieril/dhall-rust/compare/serde_dhall-v0.4.0...serde_dhall-v0.5.0 + ## License Licensed under the terms of the 2-Clause BSD License ([LICENSE](LICENSE) or diff --git a/abnf_to_pest/Cargo.toml b/abnf_to_pest/Cargo.toml index 1567512..6e4cfe7 100644 --- a/abnf_to_pest/Cargo.toml +++ b/abnf_to_pest/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "abnf_to_pest" -version = "0.2.0" # remember to update html_root_url +# remember to update html_root_url +version = "0.5.0" authors = ["Nadrieril <nadrieril@users.noreply.github.com>"] license = "MIT OR Apache-2.0" edition = "2018" diff --git a/abnf_to_pest/src/lib.rs b/abnf_to_pest/src/lib.rs index ba8bdf2..a579493 100644 --- a/abnf_to_pest/src/lib.rs +++ b/abnf_to_pest/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/abnf_to_pest/0.2.0")] +#![doc(html_root_url = "https://docs.rs/abnf_to_pest/0.5.0")] //! A tiny crate that helps convert ABNF grammars to [pest][pest]. //! diff --git a/dhall/Cargo.toml b/dhall/Cargo.toml index bb60d9e..75d38f1 100644 --- a/dhall/Cargo.toml +++ b/dhall/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "dhall" -version = "0.4.0" # remember to update html_root_url +# remember to update html_root_url +version = "0.5.0" authors = ["NanoTech <nanotech@nanotechcorp.net>", "Nadrieril <nadrieril@users.noreply.github.com>"] license = "BSD-2-Clause" description = "Implementation of the Dhall configuration language" @@ -30,7 +31,7 @@ version-sync = "0.8" [build-dependencies] walkdir = "2" -abnf_to_pest = { version = "0.2.0", path = "../abnf_to_pest" } +abnf_to_pest = { version = "^0.5.0", path = "../abnf_to_pest" } pest_generator = "2.1" quote = "1.0" diff --git a/dhall/src/lib.rs b/dhall/src/lib.rs index 392c344..98ad4f0 100644 --- a/dhall/src/lib.rs +++ b/dhall/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/dhall/0.4.0")] +#![doc(html_root_url = "https://docs.rs/dhall/0.5.0")] #![allow( clippy::implicit_hasher, clippy::module_inception, diff --git a/dhall_proc_macros/Cargo.toml b/dhall_proc_macros/Cargo.toml index 48b55e8..d770aa8 100644 --- a/dhall_proc_macros/Cargo.toml +++ b/dhall_proc_macros/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "dhall_proc_macros" -version = "0.4.0" # remember to update html_root_url +# remember to update html_root_url +version = "0.5.0" authors = ["Nadrieril <nadrieril@users.noreply.github.com>"] license = "BSD-2-Clause" description = "Macros for dhall" diff --git a/dhall_proc_macros/src/lib.rs b/dhall_proc_macros/src/lib.rs index 2178f00..9f20e2d 100644 --- a/dhall_proc_macros/src/lib.rs +++ b/dhall_proc_macros/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/dhall_proc_macros/0.4.0")] +#![doc(html_root_url = "https://docs.rs/dhall_proc_macros/0.5.0")] //! This crate contains the code-generation primitives for the [dhall-rust][dhall-rust] crate. //! This is highly unstable and breaks regularly; use at your own risk. //! diff --git a/release.toml b/release.toml new file mode 100644 index 0000000..eef7d2a --- /dev/null +++ b/release.toml @@ -0,0 +1,10 @@ +disable-push = true +disable-publish = true +no-dev-version = true +pre-release-commit-message = "Release {{crate_name}} version {{version}}" + +[[pre-release-replacements]] +file = "src/lib.rs" +search = "\\[doc\\(html_root_url = .*\\)\\]" +replace = "[doc(html_root_url = \"https://docs.rs/{{crate_name}}/{{version}}\")]" +exactly = 1 diff --git a/serde_dhall/Cargo.toml b/serde_dhall/Cargo.toml index 6af883a..d6e8d9f 100644 --- a/serde_dhall/Cargo.toml +++ b/serde_dhall/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "serde_dhall" -version = "0.4.0" # remember to update html_root_url, README and changelog +# remember to update html_root_url, README and changelog +version = "0.5.0" authors = ["Nadrieril <nadrieril@users.noreply.github.com>"] license = "BSD-2-Clause" description = "Dhall support for serde" @@ -11,8 +12,8 @@ edition = "2018" [dependencies] serde = { version = "1.0", features = ["derive"] } -dhall = { version = "=0.4.0", path = "../dhall" } -dhall_proc_macros = { version = "=0.4.0", path = "../dhall_proc_macros" } +dhall = { version = "= 0.5.0", path = "../dhall" } +dhall_proc_macros = { version = "= 0.5.0", path = "../dhall_proc_macros" } doc-comment = "0.3" reqwest = { version = "0.10", features = ["blocking"] } url = "2.1" diff --git a/serde_dhall/release.toml b/serde_dhall/release.toml new file mode 100644 index 0000000..d15cf88 --- /dev/null +++ b/serde_dhall/release.toml @@ -0,0 +1,35 @@ +[[pre-release-replacements]] +file = "src/lib.rs" +search = "\\[doc\\(html_root_url = .*\\)\\]" +replace = "[doc(html_root_url = \"https://docs.rs/{{crate_name}}/{{version}}\")]" +exactly = 1 + +[[pre-release-replacements]] +file = "../README.md" +search = "serde_dhall = \".*\"" +replace = "{{crate_name}} = \"{{version}}\"" +exactly = 1 + +[[pre-release-replacements]] +file = "../README.md" +search = "#### \\[Unreleased\\]" +replace = "#### [Unreleased]\n\n#### [{{version}}] - {{date}}" +exactly = 1 + +[[pre-release-replacements]] +file = "../README.md" +search = "\\[Unreleased\\]:" +replace = "[{{version}}]:" +exactly = 1 + +[[pre-release-replacements]] +file = "../README.md" +search = "\\.\\.\\.HEAD" +replace = "...{{tag_name}}" +exactly = 1 + +[[pre-release-replacements]] +file = "../README.md" +search = "<!-- next-url -->" +replace = "<!-- next-url -->\n[Unreleased]: https://github.com/Nadrieril/dhall-rust/compare/{{tag_name}}...HEAD" +exactly = 1 diff --git a/serde_dhall/src/lib.rs b/serde_dhall/src/lib.rs index c478b2a..bff8989 100644 --- a/serde_dhall/src/lib.rs +++ b/serde_dhall/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/serde_dhall/0.4.0")] +#![doc(html_root_url = "https://docs.rs/serde_dhall/0.5.0")] #![warn(missing_docs, missing_doc_code_examples)] //! [Dhall][dhall] is a programmable configuration language that provides a non-repetitive //! alternative to JSON and YAML. diff --git a/serde_dhall/src/options.rs b/serde_dhall/src/options.rs index 06a4368..76b1c5b 100644 --- a/serde_dhall/src/options.rs +++ b/serde_dhall/src/options.rs @@ -302,6 +302,8 @@ impl<'a, A> Deserializer<'a, A> { /// This returns a [`Deserializer`] object. Call the [`parse`] method to get the deserialized /// value, or use other [`Deserializer`] methods to control the deserialization process. /// +/// Imports will be resolved relative to the current directory. +/// /// # Example /// /// ```rust @@ -338,6 +340,8 @@ pub fn from_str(s: &str) -> Deserializer<'_, NoAnnot> { /// This returns a [`Deserializer`] object. Call the [`parse`] method to get the deserialized /// value, or use other [`Deserializer`] methods to control the deserialization process. /// +/// Imports will be resolved relative to the provided file's path. +/// /// # Example /// /// ```no_run |