Skip to content

Commit a02c0db

Browse files
authored
feat: Support TOML 1.1 (#1079)
Fixes #397
2 parents 34d45f2 + 5cfb838 commit a02c0db

File tree

121 files changed

+493
-503
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+493
-503
lines changed

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/toml/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "toml"
3-
version = "0.9.9+spec-1.0.0"
3+
version = "0.9.9+spec-1.1.0"
44
description = """
55
A native Rust encoder and decoder of TOML-formatted files and streams. Provides
66
implementations of the standard Serialize/Deserialize traits for TOML data to

crates/toml/src/de/parser/array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::de::{DeArray, DeValue};
66

77
use crate::de::parser::prelude::*;
88

9-
/// ```bnf
9+
/// ```abnf
1010
/// ;; Array
1111
///
1212
/// array = array-open array-values array-close

crates/toml/src/de/parser/document.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::de::DeValue;
99
use crate::de::{DeArray, DeTable};
1010
use crate::map::Entry;
1111

12-
/// ```bnf
12+
/// ```abnf
1313
/// ;; TOML
1414
///
1515
/// toml = expression *( newline expression )
@@ -97,7 +97,7 @@ pub(crate) fn document<'i>(
9797
Spanned::new(span, state.root)
9898
}
9999

100-
/// ```bnf
100+
/// ```abnf
101101
/// ;; Standard Table
102102
///
103103
/// std-table = std-table-open key *( table-key-sep key) std-table-close

crates/toml/src/de/parser/inline_table.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ use crate::de::DeTable;
1010
use crate::de::DeValue;
1111
use crate::map::Entry;
1212

13-
/// ```bnf
13+
/// ```abnf
1414
/// ;; Inline Table
1515
///
16-
/// inline-table = inline-table-open inline-table-keyvals inline-table-close
16+
/// inline-table = inline-table-open [ inline-table-keyvals ] ws-comment-newline inline-table-close
1717
/// ```
1818
pub(crate) fn on_inline_table<'i>(
1919
open_event: &toml_parser::parser::Event,

crates/toml/src/de/parser/key.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::alloc_prelude::*;
44
use crate::de::parser::prelude::*;
55
use crate::de::DeString;
66

7-
/// ```bnf
7+
/// ```abnf
88
/// key = simple-key / dotted-key
99
/// dotted-key = simple-key 1*( dot-sep simple-key )
1010
/// ```

crates/toml/src/de/parser/value.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::de::DeFloat;
88
use crate::de::DeInteger;
99
use crate::de::DeValue;
1010

11-
/// ```bnf
11+
/// ```abnf
1212
/// val = string / boolean / array / inline-table / date-time / float / integer
1313
/// ```
1414
pub(crate) fn value<'i>(

crates/toml/tests/decoder_compliance.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn main() {
2121

2222
let decoder = decoder::Decoder;
2323
let mut harness = toml_test_harness::DecoderHarness::new(decoder);
24-
harness.version("1.0.0");
24+
harness.version("1.1.0");
2525
harness.ignore([]).unwrap();
2626
harness.snapshot_root("tests/snapshots");
2727
harness.extend_invalid(invalid_ext);

crates/toml/tests/encoder_compliance.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fn main() {
66
let encoder = encoder::Encoder;
77
let decoder = decoder::Decoder;
88
let mut harness = toml_test_harness::EncoderHarness::new(encoder, decoder);
9-
harness.version("1.0.0");
9+
harness.version("1.1.0");
1010
harness.test();
1111
}
1212

crates/toml/tests/snapshots/invalid/array/no-close-04.stderr

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
TOML parse error at line 1, column 26
2-
|
3-
1 | no-close-04 = [{ key = 42
4-
| ^
5-
newlines are unsupported in inline tables, expected nothing
6-
7-
---
81
TOML parse error at line 1, column 27
92
|
103
1 | no-close-04 = [{ key = 42

0 commit comments

Comments
 (0)