Skip to content

Commit

Permalink
Merge branch 'develop' into unstable
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
Tamschi committed Jul 15, 2021
2 parents 4f9a793 + 5d731a9 commit c1cc8c6
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ If applicable, add screenshots to help explain your problem.
**please complete the following information:**

- `rustc --version`: [e.g. 1.53.0]
- Crate version (if applicable): [e.g. 0.0.8]
- Crate version (if applicable): [e.g. 0.0.9]

**Additional context**
Add any other context about the problem here.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

<!-- markdownlint-disable no-trailing-punctuation -->

## 0.0.9

2021-07-15

* Features:
* Added `DiagnosticType::UnknownEncoding` and `DiagnosticType::EncodeFailed`.

## 0.0.8

2021-07-12
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "taml"
version = "0.0.8"
version = "0.0.9"
authors = ["Tamme Schichler <tamme@schichler.dev>"]
edition = "2018"
description = "A kind-to-humans configuration language."
license = "MIT OR Apache-2.0"
repository = "https://github.com/Tamschi/taml"
homepage = "https://github.com/Tamschi/taml/tree/v0.0.8"
documentation = "https://docs.rs/taml/0.0.8"
homepage = "https://github.com/Tamschi/taml/tree/v0.0.9"
documentation = "https://docs.rs/taml/0.0.9"
keywords = ["structured", "humane", "configuration", "parser"]
categories = ["parser-implementations"]
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

![Rust 1.53](https://img.shields.io/static/v1?logo=Rust&label=&message=1.53&color=grey)
[![CI](https://github.com/Tamschi/taml/workflows/CI/badge.svg?branch=unstable)](https://github.com/Tamschi/taml/actions?query=workflow%3ACI+branch%3Aunstable)
![Crates.io - License](https://img.shields.io/crates/l/taml/0.0.8)
![Crates.io - License](https://img.shields.io/crates/l/taml/0.0.9)

[![GitHub](https://img.shields.io/static/v1?logo=GitHub&label=&message=%20&color=grey)](https://github.com/Tamschi/taml)
[![open issues](https://img.shields.io/github/issues-raw/Tamschi/taml)](https://github.com/Tamschi/taml/issues)
Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

| Version | Supported | ***Initial*** Reason for Removal |
| ------- | ------------------ | ------------------------------------------------------------------------------------------------------------ |
| 0.0.8 | :white_check_mark: | |
| 0.0.8-9 | :white_check_mark: | |
| 0.0.7 | :shipit: | Detailed spans for "decoded" values (`<…:…>`) use local positions in this version, which wasn't intentional. |
| 0.0.1-6 | :white_check_mark: | |

Expand Down
14 changes: 14 additions & 0 deletions src/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,20 @@ enum_properties! {
level: DiagnosticLevel::Error,
title: "Missing field",
},

UnknownEncoding {
group: DiagnosticGroup::Deserialising,
code: 7,
level: DiagnosticLevel::Error,
title: "Unknown encoding",
},

EncodeFailed {
group: DiagnosticGroup::Deserialising,
code: 8,
level: DiagnosticLevel::Error,
title: "Encode failed",
},
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![doc(html_root_url = "https://docs.rs/taml/0.0.8")]
#![doc(html_root_url = "https://docs.rs/taml/0.0.9")]
#![warn(clippy::pedantic)]
#![allow(clippy::result_unit_err)]
#![allow(clippy::trivially_copy_pass_by_ref)]
Expand Down

0 comments on commit c1cc8c6

Please sign in to comment.