gentoo auto-resync : 19:07:2024 - 12:29:09

3 files changed, 85 insertions, 1 deletions

diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 6e3e1834c9e6..f9ab7126d783 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -2,6 +2,7 @@ AUX watchman-2022.02.28.00-libatomic.patch 2254 BLAKE2B 4eec2caf20f9c892bd9d2a79
 AUX watchman-2022.08.08.00-musl-fsword-fix.patch 908 BLAKE2B 79cffe220bde36cada12da0136f7e696151f59763cf07a774fd4da800b362b1943ed99e773751e9e4ff9aa2537812a975f166bc1b60790e22b90e329ac8e5e82 SHA512 82853ce11da25f109c1e58e16d4bdc81d8a4824865763d036a95ac6a2c49077443ec41b1bd1f6c30cfa55595413dc9b6d6c7c69c4bedce9d82cf32de3909cd7e
 AUX watchman-2023.01.16.00-python-working-dir.patch 2270 BLAKE2B 169486ea5b0a585d33f177a4a3746ab0ae5b1fde239cc7fb0ad832ec8946de1d1d3b6b4d3344b0c8552fa4fa8e88ab4ba9e820aadbfafd7fee5d07aac51ce059 SHA512 b46d710fa00ef75f4331fd2451b7faa9edb5901f5b35fe8e34b05931064224d5fd29033b3ab7132f25073a2cd8a8294d673cae2ee88962ce1e6c877597ef5ca1
 AUX watchman-2023.06.19.00-rust-1.70-avoidance.patch 1355 BLAKE2B 30f95b1c644ae85e179992ca2a85e6d3d83014a2c66a01b5572fefd97b6b2a0547bae7e1b9317f1933e13584e67cf5d5752e67cb79324f3051f82c418a51cd79 SHA512 12f8bcba588a47d1de6154af416edc37177d64adb906b79624642335e88764d5c41c919e1ba88b934fd39bc8489f223efc8aadea78d8197f7deddc80830adcbf
+AUX watchman-2023.06.19.00-unused.patch 2706 BLAKE2B e0cc2101620cdebddd4529b7b80e238a39324d892f269f7e2ce117908adf1b8787c1268a166197e377971a59660778dd7983aeb7abcf96fc6b1648a8c88bb622 SHA512 4410875ed07b9c294f5ce6533f18872b9fe31c8356fe49ab98e72480eafb0b932484a8ad786561d08b85aec593dfce23aa4e98bd83376db14a50dd031dace018
 AUX watchman.tmpfiles 32 BLAKE2B 88c6a5c4b1d7a35d4ed485ab1e7ba0e18a8433d176318f69e77030d4980931876fdd8d1811e0af8c924c89c358cffb7cc9ab4effbc363cfae8adc6d88597313a SHA512 5c4230d23a045704efd5851abe0cb4c6e9eba91e128bbfc677e231868ea161364055fea65800a9b8bec61d95c6a2824dffa536755e12d3b6599a81cdea5c063b
 DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
@@ -108,5 +109,5 @@ DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65
 DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
 DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
-EBUILD watchman-2023.06.19.00.ebuild 5463 BLAKE2B f08b0861f87e84451e669f5f9f04d57eba8ab966f68362931a932835740bb581dd1c68a19137da883801c5f07a72c4d6b5113b855013278d31d2d85b4b3470eb SHA512 d924851069f5bac429d9a6a4dd47ad61d67f88777e9b61adf4e33834fd54c9686d521ee5cc357ad81589a414d89caad14e29b6669efdf48c2a9cdd3d07838902
+EBUILD watchman-2023.06.19.00.ebuild 5511 BLAKE2B 26696ecff940a4822c43d62e84b324bde0e6c501592505b6896584142228f329605811497157e9ff47929726411550a7a2d26048fa77cfe3b09e01d3b740e6f3 SHA512 7043e9f58fb6ed9beb458cb2b9368581e264ca425747647f23283387dbcb5950b8ec9def9dadd04696ada3e88a399d3d68f35fe19b63e82e7f006c684ac39ffc
 MISC metadata.xml 429 BLAKE2B e69d0fb854d42a000fdc5609c7c6a12b8928eef97630b9043813a44da1bb24639648cf8a412ae7a2d0c0b7e058e2a2df65d33ee7f5198c1aea3253106d43cc75 SHA512 bf683e13fc81e5bfea3dcd80edf4a10fdae95807074035e0f8a63be4d7137488a92396b7bdcdbff5a539922f6d3fd57b67c5e5720a27b3d471d29c96b3b061ff
diff --git a/dev-util/watchman/files/watchman-2023.06.19.00-unused.patch b/dev-util/watchman/files/watchman-2023.06.19.00-unused.patch
new file mode 100644
index 000000000000..fe8728f9cf71
--- /dev/null
+++ b/dev-util/watchman/files/watchman-2023.06.19.00-unused.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/936225
+https://github.com/facebook/watchman/commit/c3536143cab534cdd9696eb3e2d03c4ac1e2f883
+
+From c3536143cab534cdd9696eb3e2d03c4ac1e2f883 Mon Sep 17 00:00:00 2001
+From: Jun Wu <quark@meta.com>
+Date: Tue, 18 Jun 2024 15:23:48 -0700
+Subject: [PATCH] rust: relax deny(warnings) to internal-only
+
+Summary:
+`deny(warnings)` makes the code fragile with subtle compiler differences
+(upgrade, or internal vs external configuration).
+
+For example, the external rustc complains:
+
+  C:\src\watchman\watchman\rust\watchman_client>cargo check
+      Checking watchman_client v0.9.0 (C:\open\watchman\watchman\rust\watchman_client)
+  error: field `unilateral` is never read
+     --> src\lib.rs:589:17
+      |
+  588 |         pub struct Unilateral {
+      |                    ---------- field in this struct
+  589 |             pub unilateral: bool,
+      |                 ^^^^^^^^^^
+      |
+      = note: `Unilateral` has a derived impl for the trait `Debug`, but this is intentionally ignored during dead code analysis
+
+while the internal one doesn't:
+
+  watchman/rust/watchman_client % arc rust-check --flagfile fbcode//mode/win  :watchman_client
+  ..
+  BXL SUCCEEDED
+
+It seems a bad idea to publish an internally-green code that fails to compile
+externally, or has to upgrade the code every time a compiler upgrade detects
+some new issues.
+
+Let's just limit `deny(warnings)` to internal only when building with buck.
+
+See also https://www.reddit.com/r/rust/comments/f5xpib/psa_denywarnings_is_actively_harmful/
+
+Reviewed By: MichaelCuevas
+
+Differential Revision: D58753075
+
+fbshipit-source-id: bd09c09b4195c884172afab2200e3b2857af67d3
+---
+ watchman/rust/serde_bser/src/lib.rs      | 3 ++-
+ watchman/rust/watchman_client/src/lib.rs | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/watchman/rust/serde_bser/src/lib.rs b/watchman/rust/serde_bser/src/lib.rs
+index cf2fe51b2202..b169c977cf05 100644
+--- a/watchman/rust/serde_bser/src/lib.rs
++++ b/watchman/rust/serde_bser/src/lib.rs
+@@ -1,4 +1,3 @@
+-#![deny(warnings, rust_2018_idioms)]
+ /*
+  * Copyright (c) Meta Platforms, Inc. and affiliates.
+  *
+@@ -6,6 +5,8 @@
+  * LICENSE file in the root directory of this source tree.
+  */
+ 
++#![cfg_attr(fbcode_build, deny(warnings, rust_2018_idioms))]
++
+ pub mod bytestring;
+ pub mod de;
+ mod errors;
+diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs
+index 1d102fe0b2bd..df902313c6a5 100644
+--- a/watchman/rust/watchman_client/src/lib.rs
++++ b/watchman/rust/watchman_client/src/lib.rs
+@@ -33,7 +33,7 @@
+ //!     Ok(())
+ //! }
+ //! ```
+-#![deny(warnings)]
++#![cfg_attr(fbcode_build, deny(warnings))]
+ 
+ pub mod expr;
+ pub mod fields;
+
diff --git a/dev-util/watchman/watchman-2023.06.19.00.ebuild b/dev-util/watchman/watchman-2023.06.19.00.ebuild
index 55b90312e885..9b399e090d42 100644
--- a/dev-util/watchman/watchman-2023.06.19.00.ebuild
+++ b/dev-util/watchman/watchman-2023.06.19.00.ebuild
@@ -168,6 +168,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch
 	"${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch
 	"${FILESDIR}"/${PN}-2023.06.19.00-rust-1.70-avoidance.patch
+	"${FILESDIR}"/${PN}-2023.06.19.00-unused.patch
 )
 
 # Rust utility