Remove flatten to improve deserialization error messages
#7598
+240
−29
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Wow... |
charliermarsh
commented
Sep 20, 2024
| @@ -33,13 +33,15 @@ pub(crate) struct Tools { | |||
| /// A `[tool.uv]` section. | |||
| #[allow(dead_code)] | |||
| #[derive(Debug, Clone, Default, Deserialize, CombineOptions, OptionsMetadata)] | |||
| #[serde(rename_all = "kebab-case", deny_unknown_fields)] | |||
| #[serde(from = "OptionsWire", rename_all = "kebab-case")] | |||
| #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] | |||
| pub struct Options { | |||
| #[serde(flatten)] | |||
There was a problem hiding this comment.
I left these here because schemars uses them for the JSON schema.
zanieb
reviewed
Sep 20, 2024
| #[derive(Debug, Clone, Default, Deserialize)] | ||
| #[serde(rename_all = "kebab-case", deny_unknown_fields)] | ||
| pub struct OptionsWire { | ||
| // #[serde(flatten)] |
There was a problem hiding this comment.
Yes, to indicate where the various sections start and end.
There was a problem hiding this comment.
That's sort of confusing, but okay.
zanieb
approved these changes
Sep 20, 2024
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Sep 23, 2024
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.4.13` -> `0.4.15` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>astral-sh/uv (astral-sh/uv)</summary> ### [`v0.4.15`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0415) [Compare Source](astral-sh/uv@0.4.14...0.4.15) ##### Bug fixes - Revert "Treat invalid platform as more compatible than invalid Python ([#​7556](astral-sh/uv#7556))" ([#​7608](astral-sh/uv#7608)) ##### Documentation - Add the execution policy to powershell installs for single versions ([#​7602](astral-sh/uv#7602)) ### [`v0.4.14`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0414) [Compare Source](astral-sh/uv@0.4.13...0.4.14) ##### Breaking - Move uvx shell completion to `uvx --generate-shell-completion` ([#​7511](astral-sh/uv#7511)) ##### Enhancements - Adjust messaging for frozen hint on resolution failure during `uv add` ([#​7597](astral-sh/uv#7597)) - Provide resolution hints in case of possible local name conflicts ([#​7505](astral-sh/uv#7505)) - Improve Docker image release tagging order and display on `ghcr.io` ([#​7568](astral-sh/uv#7568)) - Improve deserialization error messages ([#​7598](astral-sh/uv#7598)) ##### Bug fixes - Allow system environments during project environment validity check ([#​7585](astral-sh/uv#7585)) - Avoid validating workspace members when `--no-sources` is provided ([#​7599](astral-sh/uv#7599)) - Fix handling of `sys.base_prefix` collision in interpreter identity check during tool installs ([#​7596](astral-sh/uv#7596)) - Make `uv cache prune` robust to unreadable rkyv entries ([#​7561](astral-sh/uv#7561)) - Revert "Remove duplicate warning for settings discovery errors ([#​7384](astral-sh/uv#7384))" ([#​7594](astral-sh/uv#7594)) ##### Documentation - Fix `-` to `_` in packaged applications document ([#​7571](astral-sh/uv#7571)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
#[serde(flatten)]has a disastrous effect on error messages: serde no longer tells you which field errored, nor does it show it to you in the diagnostic output.Before:
After:
Closes #7113.