diff options
author | Alex Crichton <alex@alexcrichton.com> | 2018-09-25 10:08:38 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-25 10:08:38 -0700 |
commit | 82b3b47eb8921dcf6eeee42fbe523fc79e45537e (patch) | |
tree | 52b7740ab46eaff37016b53a71f733dc6eba7908 /src/de.rs | |
parent | 8181a7e645064426b43891b0f4c7fa86c2a2d154 (diff) | |
parent | 2f372b9f1079b866d633d6b5cecfaf573f3480f0 (diff) | |
download | milf-rs-82b3b47eb8921dcf6eeee42fbe523fc79e45537e.tar.gz milf-rs-82b3b47eb8921dcf6eeee42fbe523fc79e45537e.zip |
Merge pull request #261 from rhysd/fix-multiline-string-key
Fix multi-line strings are not allowed for key (#260)
Diffstat (limited to 'src/de.rs')
-rw-r--r-- | src/de.rs | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -152,6 +152,9 @@ enum ErrorKind { /// An empty table key was found. EmptyTableKey, + /// Multiline strings are not allowed for key + MultilineStringKey, + /// A custom error which could be generated when deserializing a particular /// type. Custom, @@ -1274,6 +1277,9 @@ impl<'a> Deserializer<'a> { TokenError::EmptyTableKey(at) => { self.error(at, ErrorKind::EmptyTableKey) } + TokenError::MultilineStringKey(at) => { + self.error(at, ErrorKind::MultilineStringKey) + } } } @@ -1377,6 +1383,7 @@ impl fmt::Display for Error { } ErrorKind::RedefineAsArray => "table redefined as array".fmt(f)?, ErrorKind::EmptyTableKey => "empty table key found".fmt(f)?, + ErrorKind::MultilineStringKey => "multiline strings are not allowed for key".fmt(f)?, ErrorKind::Custom => self.inner.message.fmt(f)?, ErrorKind::ExpectedString => "expected string".fmt(f)?, ErrorKind::DottedKeyInvalidType => "dotted key attempted to extend non-table type".fmt(f)?, @@ -1421,6 +1428,7 @@ impl error::Error for Error { ErrorKind::DuplicateTable(_) => "duplicate table", ErrorKind::RedefineAsArray => "table redefined as array", ErrorKind::EmptyTableKey => "empty table key found", + ErrorKind::MultilineStringKey => "invalid multiline string for key", ErrorKind::Custom => "a custom error", ErrorKind::ExpectedString => "expected string", ErrorKind::DottedKeyInvalidType => "dotted key invalid type", |