build(deps): bump toml from 0.5.10 to 0.6.0 #5656
Conversation
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?s=60&v=4){kind=small}
dependabot
bot
added
A-dependencies
|
https://github.com/toml-rs/toml/blob/main/crates/toml/CHANGELOG.md#060---2023-01-23
|
dependabot
bot
force-pushed
the
dependabot/cargo/toml-0.6.0
branch
from
72ce4bf
to
0c1cb40
Compare
|
#5659 covers the changes necessary for the migration |
|
This is a rather large update with significant improvements. See https://epage.github.io/blog/2023/01/toml-vs-toml-edit/ for details. |
|
@dependabot rebase |
dependabot
bot
force-pushed
the
dependabot/cargo/toml-0.6.0
branch
from
0c1cb40
to
f2c7c00
Compare
the-mikedavis
force-pushed
the
dependabot/cargo/toml-0.6.0
branch
2 times, most recently
from
8b0c916
to
13ec04b
Compare
Bumps [toml](https://github.com/toml-rs/toml) from 0.5.10 to 0.6.0. - [Release notes](https://github.com/toml-rs/toml/releases) - [Commits](toml-rs/toml@toml-v0.5.10...toml-v0.6.0) --- updated-dependencies: - dependency-name: toml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
`toml::from_slice` has been removed. The CHANGELOG recommends using `toml::from_str` instead and doing the byte-to-str conversion yourself. The `toml::toml!` macro has also changed to return the type of the value declared within the macro body. In the change in `helix-view/src/theme.rs` this is a `toml::map::Map` (it was a `toml::Value` previously) allowing us to skip the match and use the map directly. Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
The `From<Value>` implementation for `Theme` converted the Value to a string and re-parsed the string to convert it to `HashMap<String, Value>` which feels a bit wasteful. This change uses the underlying `toml::map::Map` directly when the value is a table and warns about the unexpected `Value` shape otherwise. This is necessary because toml 0.6.0 changes the Display implementation for Value::Table so that the `to_string` no longer encodes the value as a Document, just a Value. So the parse of the Value fails to be decoded as a HashMap. The behavior for returning `Default::default` matches the previous code's behavior except that it did not warn when the input Value was failed to parse.
the-mikedavis
force-pushed
the
dependabot/cargo/toml-0.6.0
branch
from
13ec04b
to
c546883
Compare
|
@pascalkuthe I folded the change from #5671 into this branch. Could you give the changes a second look here? There were some other changes besides |
|
I aslo noticed aswell while trying this out locally. This |
There was a problem hiding this comment.
This toml update fixes #4241
The Theme changes LGTM. It's even an improvement the roundtrip trough string was weird. I had something similar locally.
There is one last breaking change I found in the keymap deserializer. The new toml version can only serialize to String not to &str`. You can include the following commit to fix that:
Once that is done this can be merged I believe
The new version of the `toml` crate is based on `toml_edit` and does not support zero copy deserialization anymore. So we need to deserialize `String` instead of `&str` in the keympa
|
For #4241 do you mean it's fixed by the error message improvements? I see which is a nice improvement |
So never mind about that, sorry I misremembered the issue. That issue can be close regardless d I think. The error message is pretty good now tough so I stil think that issue can be closed. I will add something FAQ. |
Bumps toml from 0.5.10 to 0.6.0.
Commits
cf5b7d0chore: Releasebd4cd85chore: Release607c06bdocs: Update changelogb3e0389Merge pull request #487 from epage/fix2069c72docs(toml): Help people serialize/deserialize values44d2ee8docs(toml): Update stray reference to Valueeb2f20adocs(toml): Remove ignore warning icona4fd0b1docs(toml): Update map documentation709dd35docs(toml): Mirror serde_json in inlining in root226639cfix(toml)!:toml!now generates aTableDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)