From 60e9677364f894b28c3fcfe3551cd76968542fc6 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 11 Oct 2024 15:15:49 -0500
Subject: [PATCH] backout: partial reversion of 3f0703ca2cf

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>
---
 cli/Cargo.toml             | 3 ---
 lib/Cargo.toml             | 3 ---
 lib/gen-protos/Cargo.toml  | 3 ---
 lib/proc-macros/Cargo.toml | 3 ---
 lib/testutils/Cargo.toml   | 3 ---
 5 files changed, 15 deletions(-)

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index bf9b4de4c7..ef261d1782 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -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
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index 2fb64c2322..cc27bd6366 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -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
diff --git a/lib/gen-protos/Cargo.toml b/lib/gen-protos/Cargo.toml
index ac6f4a3683..13f3043e60 100644
--- a/lib/gen-protos/Cargo.toml
+++ b/lib/gen-protos/Cargo.toml
@@ -9,6 +9,3 @@ license = { workspace = true }
 
 [dependencies]
 prost-build = { workspace = true }
-
-[lints]
-workspace = true
diff --git a/lib/proc-macros/Cargo.toml b/lib/proc-macros/Cargo.toml
index 8f2c000342..e26bfa26ba 100644
--- a/lib/proc-macros/Cargo.toml
+++ b/lib/proc-macros/Cargo.toml
@@ -20,6 +20,3 @@ proc-macro = true
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { workspace = true }
-
-[lints]
-workspace = true
diff --git a/lib/testutils/Cargo.toml b/lib/testutils/Cargo.toml
index 8bc3309ef0..62b0ed866f 100644
--- a/lib/testutils/Cargo.toml
+++ b/lib/testutils/Cargo.toml
@@ -25,6 +25,3 @@ jj-lib = { workspace = true, features = ["testing"] }
 pollster = { workspace = true }
 rand = { workspace = true }
 tempfile = { workspace = true }
-
-[lints]
-workspace = true