Commit graph

561 commits

Author SHA1 Message Date
Eric Huss 514b8ca8f2 Fix error line/column when using CRLF line endings. 2019-08-13 13:48:54 -07:00
Alex Crichton 64d1385946 Merge pull request #319 from NickHackman/modernize-enum-discriminant-comparison
Simplified Logic when comparing discriminants
2019-08-13 14:36:26 -05:00
Nick Hackman 64e2f4742f Simplified Logic when comparing discriminants
Removed matches that were used to compare Enum variants for equality in
favor of using discriminant from https://doc.rust-lang.org/std/mem/fn.discriminant.html
introduced in Rust 1.21.0
2019-08-13 14:13:01 -04:00
Alex Crichton 2b51f841bc Bump to 0.5.2 2019-08-13 07:55:09 -07:00
Alex Crichton 9cf3f2ddd1 Merge pull request #318 from JustAPerson/patch-1
Derive Clone+PartialEq for Spanned
2019-08-13 09:38:25 -05:00
Jason Priest 4018ebc65a Derive Clone+PartialEq for Spanned
Should any other traits be derived?
2019-08-12 21:27:26 -05:00
Alex Crichton fd39bc7412 Run cargo fmt 2019-08-12 13:50:59 -07:00
Alex Crichton 59c0d52600 Fix a bad merge 2019-08-12 13:50:44 -07:00
Alex Crichton 7a11ed691a Merge pull request #315 from jwdeitch/master
Allow conversion from de::Error to std::io::error
2019-08-12 15:35:55 -05:00
Alex Crichton 7e8b40b025 Merge pull request #314 from zertosh/add-line-and-col-to-errors
Add line and column to all Errors
2019-08-12 15:35:35 -05:00
Alex Crichton 577c2ed766 Merge pull request #317 from ehuss/outlives-requirements
Squelch explicit_outlives_requirements warning.
2019-08-12 12:05:22 -05:00
Eric Huss 5cb9b37b99 Squelch explicit_outlives_requirements warning. 2019-08-12 09:12:39 -07:00
Alex Crichton d410e2814f Merge pull request #316 from pietroalbini/doc-spanned
Include Spanned in the docs
2019-08-09 16:53:38 -05:00
Pietro Albini c6745eeaeb include Spanned in the docs
The `Spanned` struct was originally included in the docs as a re-export,
but rustdoc doesn't render re-exports if the module from which it's
exported isn't documented.

Since `Spanned` is the only public item inside the `spanned` module this
commit shows the struct as a normal item in the index, and moves the
example from the module docs to the struct docs.
2019-08-09 20:48:46 +02:00
Jordan Deitch d3eedc52ba convert toml error to std::io error 2019-08-01 20:43:05 -04:00
Andres Suarez b09bb78352 Add line and column to all Errors 2019-07-30 13:35:08 -04:00
Andres Suarez 7875d03eeb Add tests covering custom deserializers 2019-07-30 13:16:59 -04:00
Alex Crichton 45361e70b9 Merge pull request #313 from zertosh/show-col-in-errors
Show "column" in Error messages
2019-07-29 09:06:35 -05:00
Andres Suarez 8c1b49f66f Show "column" in Error messages 2019-07-28 13:41:17 -04:00
Andres Suarez 8820659431 Fully expand error messages in tests 2019-07-28 12:58:26 -04:00
Eric Huss 0a3fd8ae62 Merge pull request #311 from Aaron1011/feature/update-serde
Bump Serde dependency to 1.0.97
2019-07-27 18:33:42 -07:00
Aaron Hill c6571b048e Bump Serde dependency to 1.0.97
toml-rs depends on some Serde types not present in Serde 1.0.0 (e.g
BorrowedStrDeserializer). By explicitly depending on a newever version,
we ensure compatibility with any crates using '-Z minimal-versions'

Note that we could probably depend on an older version of Serde, but I
didn't see much point in finding the exact minimum patch release that's
compatible with toml-rs
2019-07-27 20:43:58 -04:00
Alex Crichton 953940f82e Bump to 0.5.1 2019-05-16 13:10:01 -07:00
Alex Crichton e769341003 Merge pull request #308 from ehuss/edition-2018
Migrate to 2018 edition
2019-05-09 06:49:11 -07:00
Alex Crichton 895a039279 Merge pull request #307 from ehuss/remove-conditional-rustc
Remove rustc version checking.
2019-05-09 06:47:06 -07:00
Eric Huss 8f115c98d3 cargo fmt 2019-05-08 17:45:39 -07:00
Eric Huss 1b062a9bac Remove rustc version checking.
This is no longer necessary, as <1.20 is no longer supported.
2019-05-08 17:39:18 -07:00
Eric Huss 0737f0b27a 2018 edition idioms. 2019-05-08 17:37:38 -07:00
Eric Huss 68fd59c78d Migrate to 2018 edition. 2019-05-08 12:12:14 -07:00
Eric Huss 9842d61325 Merge pull request #305 from ehuss/0.5-version
Bump html_root_url version.
2019-04-25 11:22:29 -07:00
Eric Huss 10fb80090c Bump html_root_url version. 2019-04-25 11:15:42 -07:00
Alex Crichton a88675ebda Merge pull request #304 from felixrabe/patch-1
README.md: `0.4` -> `0.5`
2019-04-25 08:27:12 -07:00
Felix Rabe 531259cf72 README.md: 0.4 -> 0.5 2019-04-24 21:37:54 +02:00
Alex Crichton d37f25714d Merge pull request #301 from nickelc/from_table
implement From<toml::value::Table> for toml::Value
2019-04-09 09:07:45 -05:00
Constantin Nickel a622bd414c implement From<toml::value::Table> for toml::Value 2019-04-08 23:58:16 +02:00
Alex Crichton b9fbd5b6f7 Merge pull request #298 from ehuss/missing-tests
Add some missing tests, and sort some entries.
2019-04-08 09:09:27 -05:00
Alex Crichton b147fe3682 Merge pull request #299 from ehuss/fix-float-suffix
Fix float with invalid suffix.
2019-04-08 09:09:07 -05:00
Eric Huss 816b457c84 Fix float with invalid suffix. 2019-04-05 13:51:28 -07:00
Eric Huss 902e98cda1 Add some missing tests, and sort some entries. 2019-04-05 13:49:57 -07:00
Eric Huss 743cfcef05 Merge pull request #295 from ErichDonGubler/fix_warnings
Fix warnings for deprecated usages of trim_{left,right}_matches.
2019-04-02 10:50:33 -07:00
Eric Huss e17f0bba39 Merge pull request #296 from ErichDonGubler/toml_internal-stays-internal
Make importing `toml_internal` macro unnecessary when using the `toml` macro
2019-04-02 10:50:19 -07:00
Erich Gubler d34e734b39 Fix warnings for deprecated usages of trim_{left,right}_matches. 2019-04-02 09:35:28 -06:00
Erich Gubler a6071c7aac Make importing toml_internal macro unnecessary when using the toml macro 2019-04-02 09:32:51 -06:00
Alex Crichton 19ac1ea19c Merge pull request #294 from tmiasko/ml-delim
Fix parsing of repeated delimiters inside multi-line strings
2019-03-20 14:07:50 -05:00
Tomasz Miąsko a5046008e5 Fix parsing of repeated delimiters inside multi-line strings
The previous implementation of `read_string`, when looking for
delimiters ending the multi-line string and failing to find exactly
three in succession, always put a single delimiter back. This is
incorrect when exactly two delimiters are present.

Put back the correct number of delimiters depending on how many have
been already consumed from input.

The issue could be triggered only with `Owned` representation of
`MaybeString`, since otherwise `push` operation is no-op.
2019-03-20 17:58:14 +01:00
Eric Huss 1ba48019d7 Merge pull request #292 from omarabid/master
Add PartialEq to Toml::de
2019-03-11 11:34:30 -07:00
Abid Omar 861a7be7d4 Add PartialEq to Toml::de
Add PartialEq trait to Error, ErrorInner and ErrorKind.

Relevant issue: https://github.com/alexcrichton/toml-rs/issues/291
2019-03-11 18:38:50 +01:00
Alex Crichton 4a0a866fbd Merge pull request #290 from ehuss/fix-case-sensitivity
Fix case sensitivity with T, Z, and E.
2019-02-19 13:45:23 -06:00
Eric Huss b7493c9bef Fix case sensitivity with T, Z, and E. 2019-02-19 10:59:42 -08:00
Alex Crichton 7c969432ad Merge pull request #278 from Kerollmops/master
Add the preserve_order feature (rebased version)
2019-01-08 15:24:40 -08:00