Skip to content

Commit

Permalink
backout: partial backout of 3f0703c
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
thoughtpolice committed Oct 11, 2024
1 parent c656878 commit afe6396
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 15 deletions.
3 changes: 0 additions & 3 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,3 @@ watchman = ["jj-lib/watchman"]
# The archive name is jj, not jj-cli. Also, `cargo binstall` gets
# confused by the `v` before versions in archive name.
pkg-url = "{ repo }/releases/download/v{ version }/jj-v{ version }-{ target }.{ archive-format }"

[lints]
workspace = true
3 changes: 0 additions & 3 deletions lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,3 @@ git = ["dep:git2", "dep:gix", "dep:gix-filter"]
vendored-openssl = ["git2/vendored-openssl"]
watchman = ["dep:tokio", "dep:watchman_client"]
testing = ["git"]

[lints]
workspace = true
3 changes: 0 additions & 3 deletions lib/gen-protos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,3 @@ license = { workspace = true }

[dependencies]
prost-build = { workspace = true }

[lints]
workspace = true
3 changes: 0 additions & 3 deletions lib/proc-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,3 @@ proc-macro = true
proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true }

[lints]
workspace = true
3 changes: 0 additions & 3 deletions lib/testutils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,3 @@ jj-lib = { workspace = true, features = ["testing"] }
pollster = { workspace = true }
rand = { workspace = true }
tempfile = { workspace = true }

[lints]
workspace = true

0 comments on commit afe6396

Please sign in to comment.