Skip to content

backout: partial reversion of 3f0703ca2cf#4627

Closed
thoughtpolice wants to merge 1 commit into
mainfrom
aseipp/push-xpmqmlmuypzp
Closed

backout: partial reversion of 3f0703ca2cf#4627
thoughtpolice wants to merge 1 commit into
mainfrom
aseipp/push-xpmqmlmuypzp

Conversation

@thoughtpolice
Copy link
Copy Markdown
Member

All of these toml files already have a [lints] key, it just exited earlier on in the file and were missed.

However, the occurrence of duplicate keys breaks TOML parsers that have stricter standard rules and reject these files (rather than merging the values). In particular, tomllib in Python 3.11 will reject these cargo files.

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

All of these toml files already have a `[lints]` key, it just exited earlier on
in the file and were missed.

However, the occurrence of duplicate keys breaks TOML parsers that have stricter
standard rules and reject these files (rather than merging the values). In
particular, `tomllib` in Python 3.11 will reject these cargo files.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
@thoughtpolice thoughtpolice force-pushed the aseipp/push-xpmqmlmuypzp branch from afe6396 to 60e9677 Compare October 11, 2024 20:20
@thoughtpolice thoughtpolice changed the title backout: partial backout of 3f0703ca2cf backout: partial reversion of 3f0703c Oct 11, 2024
@thoughtpolice thoughtpolice changed the title backout: partial reversion of 3f0703c backout: partial backout of 3f0703ca2cf Oct 11, 2024
@thoughtpolice thoughtpolice changed the title backout: partial backout of 3f0703ca2cf backout: partial reversion of 3f0703ca2cf Oct 11, 2024
@PhilipMetzger
Copy link
Copy Markdown
Contributor

PhilipMetzger commented Oct 11, 2024

This is missing a note to #1997 as an explainer in the description. Since it depends on toml-lib for the correct behavior.

Copy link
Copy Markdown
Member

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of these toml files already have a [lints] key, it just exited earlier on
in the file and were missed.

What do you mean by that? I don't see any existing [lints] tables elsewhere in these files. And what exited earlier?

@thoughtpolice
Copy link
Copy Markdown
Member Author

Oh, you're right! OK, this was introduced on my end by a merge error, I think, and when I rebased off of my branch onto trunk, it applied the diff naturally (because my other branch introduced the lint keys separately.) I think this can be closed, but let me confirm that....

@thoughtpolice
Copy link
Copy Markdown
Member Author

Yes, PEBKAC. Sorry about that!

@thoughtpolice thoughtpolice deleted the aseipp/push-xpmqmlmuypzp branch October 11, 2024 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants