David Tolnay

Change lock_free_hashtable AtomicValue::Raw to Pod types Summary: Since version 0.6.0, the `atomic` crate requires `T: bytemuck::NoUninit` for most operations on `Atomic<T>`. https://github.com/Amanieu/atomic-rs/commit/f5333f18bf88eb1cb0c514ffcf01eef9e758d29a In `lock_free_hashtable` this translates to requiring `<_ as AtomicValue>::Raw: bytemuck::NoUninit` due to the following points: ```lang=log,counterexample error[E0599]: the method `load` exists for reference `&atomic::Atomic<<T as AtomicValue>::Raw>`, but its trait bounds were not satisfied --> fbcode/buck2/shed/lock_free_hashtable/src/fixed_cap.rs:49:37 | 49 | let ptr = entry.load(Ordering::Acquire); | ^^^^ method cannot be called on `&atomic::Atomic<<T as AtomicValue>::Raw>` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `<T as AtomicValue>::Raw: bytemuck::pod::Pod` which is required by `<T as AtomicValue>::Raw: bytemuck::no_uninit::NoUninit` error[E0599]: the method `get_mut` exists for struct `atomic::Atomic<<T as AtomicValue>::Raw>`, but its trait bounds were not satisfied --> fbcode/buck2/shed/lock_free_hashtable/src/fixed_cap.rs:146:49 | 146 | let raw = *self.entries[self.index].get_mut(); | ^^^^^^^ method cannot be called on `atomic::Atomic<<T as AtomicValue>::Raw>` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `<T as AtomicValue>::Raw: bytemuck::pod::Pod` which is required by `<T as AtomicValue>::Raw: bytemuck::no_uninit::NoUninit` error[E0599]: the method `get_mut` exists for struct `atomic::Atomic<<T as AtomicValue>::Raw>`, but its trait bounds were not satisfied --> fbcode/buck2/shed/lock_free_hashtable/src/fixed_cap.rs:160:49 | 160 | let raw = *self.entries[self.index].get_mut(); | ^^^^^^^ method cannot be called on `atomic::Atomic<<T as AtomicValue>::Raw>` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `<T as AtomicValue>::Raw: bytemuck::pod::Pod` which is required by `<T as AtomicValue>::Raw: bytemuck::no_uninit::NoUninit` error[E0599]: the method `load` exists for struct `atomic::Atomic<<T as AtomicValue>::Raw>`, but its trait bounds were not satisfied --> fbcode/buck2/shed/lock_free_hashtable/src/fixed_cap.rs:196:45 | 196 | let entry = self.entries[index].load(Ordering::Acquire); | ^^^^ method cannot be called on `atomic::Atomic<<T as AtomicValue>::Raw>` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `<T as AtomicValue>::Raw: bytemuck::pod::Pod` which is required by `<T as AtomicValue>::Raw: bytemuck::no_uninit::NoUninit` error[E0599]: the method `get_mut` exists for struct `atomic::Atomic<<T as AtomicValue>::Raw>`, but its trait bounds were not satisfied --> fbcode/buck2/shed/lock_free_hashtable/src/fixed_cap.rs:212:45 | 212 | let entry = self.entries[index].get_mut(); | ^^^^^^^ method cannot be called on `atomic::Atomic<<T as AtomicValue>::Raw>` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `<T as AtomicValue>::Raw: bytemuck::pod::Pod` which is required by `<T as AtomicValue>::Raw: bytemuck::no_uninit::NoUninit` error[E0599]: the method `get_mut` exists for struct `atomic::Atomic<<T as AtomicValue>::Raw>`, but its trait bounds were not satisfied --> fbcode/buck2/shed/lock_free_hashtable/src/fixed_cap.rs:214:38 | 214 | *self.entries[index].get_mut() = value; | ^^^^^^^ method cannot be called on `atomic::Atomic<<T as AtomicValue>::Raw>` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `<T as AtomicValue>::Raw: bytemuck::pod::Pod` which is required by `<T as AtomicValue>::Raw: bytemuck::no_uninit::NoUninit` error[E0599]: the method `load` exists for struct `atomic::Atomic<<T as AtomicValue>::Raw>`, but its trait bounds were not satisfied --> fbcode/buck2/shed/lock_free_hashtable/src/fixed_cap.rs:242:45 | 242 | let entry = self.entries[index].load(Ordering::Acquire); | ^^^^ method cannot be called on `atomic::Atomic<<T as AtomicValue>::Raw>` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `<T as AtomicValue>::Raw: bytemuck::pod::Pod` which is required by `<T as AtomicValue>::Raw: bytemuck::no_uninit::NoUninit` error[E0599]: the method `compare_exchange` exists for struct `atomic::Atomic<<T as AtomicValue>::Raw>`, but its trait bounds were not satisfied --> fbcode/buck2/shed/lock_free_hashtable/src/fixed_cap.rs:244:43 | 244 | match self.entries[index].compare_exchange( | --------------------^^^^^^^^^^^^^^^^ method cannot be called on `atomic::Atomic<<T as AtomicValue>::Raw>` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `<T as AtomicValue>::Raw: bytemuck::pod::Pod` which is required by `<T as AtomicValue>::Raw: bytemuck::no_uninit::NoUninit` ``` Reviewed By: capickett Differential Revision: D116162993 fbshipit-source-id: 9e779d33d074f0baf151d8f94b94406d28a589a1

Update to syn 3 Summary: Release notes: https://github.com/dtolnay/syn/releases/tag/3.0.0 Reviewed By: boujeepossum Differential Revision: D115079448 fbshipit-source-id: 98adeb378fe1ed96e7554b6b4f991d4a2d98ff87

Update ruff crates from 0.0.13 to 0.0.14 Reviewed By: cjlongoria Differential Revision: D120423618 fbshipit-source-id: 4190c249e2e3224ef0ab3fbe28122b29c2e2e262

Implement stronger rust-type comparison Summary: This is required for supporting newtypes inside `rust.Type`, such as in this code: ```lang=thrift rust.NewType typedef string Id struct Repro { rust.Type{name = "rustc_hash::FxHashSet"} 1: set<Id> ids; rust.Type{name = "rustc_hash::FxHashSet"} 2: set<string> strings; } ``` Previously the Rust Thrift implementation would produce `LocalImpl` impls based on comparing only 2 things: 1. the field-level or type-level Rust type string (`get_type_annotation`) 2. the Thrift type name ignoring typedefs and annotations (`get_resolved_name`) If both of those things matched, as they do in the above snippet, only a single `LocalImpl` would be generated, resulting in a compile error for the other field. ```lang=log,counterexample error[E0308]: mismatched types --> fbcode/scripts/dtolnay/thrift/lib.rs:114:40 | 114 | crate::r#impl::rs_thrift_write(&self.strings, p); | ------------------------------ ^^^^^^^^^^^^^ expected `&HashSet<Id, FxBuildHasher>`, found `&HashSet<String, FxBuildHasher>` | | | arguments to this function are incorrect | = note: expected reference `&HashSet<Id, _>` found reference `&HashSet<std::string::String, _>` note: function defined here --> fbcode/scripts/dtolnay/thrift/lib.rs:241:19 | 241 | pub(crate) fn rs_thrift_write<T, P>(value: &T, p: &mut P) | ^^^^^^^^^^^^^^^ --------- error[E0308]: `?` operator has incompatible types --> fbcode/scripts/dtolnay/thrift/lib.rs:146:34 | 146 | ... = ::anyhow::Context::context(crate::r#impl::rs_thrift_read(p), ::fbthrift::errors::DeserializingFieldError { field: "strings", strct: "Repro"})?; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `HashSet<String, FxBuildHasher>`, found `HashSet<Id, FxBuildHasher>` | = note: `?` operator cannot convert from `HashSet<Id, _>` to `HashSet<std::string::String, _>` = note: expected struct `HashSet<std::string::String, _>` found struct `HashSet<Id, _>` error[E0308]: `?` operator has incompatible types --> fbcode/scripts/dtolnay/thrift/lib.rs:161:69 | 161 | ... = ::anyhow::Context::context(crate::r#impl::rs_thrift_read(p), ::fbthrift::errors::DeserializingFieldError { field: "strings", strct: "Repro"})?, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `HashSet<String, FxBuildHasher>`, found `HashSet<Id, FxBuildHasher>` | = note: `?` operator cannot convert from `HashSet<Id, _>` to `HashSet<std::string::String, _>` = note: expected struct `HashSet<std::string::String, _>` found struct `HashSet<Id, _>` ``` This diff reimplements the `rust_type_less` comparator to more extensively distinguish types that are not equal, taking into account `rust.NewType` annotations, `rust.Adapter` annotations, and `rust.Type` annotations while stepping through unannotated typedefs. For the `rust.Adapter` case more work is needed elsewhere in the Rust whisker templates to fully support this, but this diff is enough to make many cases work with just the existing templates. Reviewed By: hchokshi Differential Revision: D117412164 fbshipit-source-id: 7e04fad7b3f57f8f7b3675d64c5c8d1c0959cd79

Sync buck2 fixups from fbsource Reviewed By: cjlongoria Differential Revision: D114409708 fbshipit-source-id: e2fa358d94001711fb55196dbc41c44ee9ab55fe

Deduplicate LocalImpl among field-level @rust.Type Summary: This code previously performed deduplication for type-level `rust.Type` annotations: ```lang=thrift rust.Type{name = "rustc_hash::FxHashMap"} typedef map<string, StackTrace> HashToStackTraceMap struct StackTraceHashResolver { 1: HashToStackTraceMap hashToStackTraceMap; } rust.Type{name = "rustc_hash::FxHashMap"} typedef map<string, StackTrace> StackTraces struct Properties { 6: StackTraces stacktraces; } ``` But not field-level `rust.Type` annotations, or between type-level and field-level annotations, resulting in colliding `LocalImpl` impls. ```lang=thrift struct StackTraceHashResolver { rust.Type{name = "rustc_hash::FxHashMap"} 1: map<string, StackTrace> hashToStackTraceMap; } struct Properties { rust.Type{name = "rustc_hash::FxHashMap"} 6: map<string, StackTrace> stacktraces; } ``` ```lang=thrift rust.Type{name = "rustc_hash::FxHashMap"} typedef map<string, StackTrace> HashToStackTraceMap struct StackTraceHashResolver { 1: HashToStackTraceMap hashToStackTraceMap; } struct Properties { rust.Type{name = "rustc_hash::FxHashMap"} 6: map<string, StackTrace> stacktraces; } ``` ```lang=log,counterexample error[E0119]: conflicting implementations of trait `Serialize<_>` for type `LocalImpl<HashMap<std::string::String, StackTrace, FxBuildHasher>>` --> fbcode/artillery/thrift/lib.rs:3511:5 | 3449 | / impl<P> ::fbthrift::Serialize<P> for LocalImpl<::rustc_hash::FxHashMap<::std::string::String, crate::types::StackTrace>> 3450 | | where 3451 | | P: ::fbthrift::ProtocolWriter, | |______________________________________- first implementation here ... 3511 | / impl<P> ::fbthrift::Serialize<P> for LocalImpl<::rustc_hash::FxHashMap<::std::string::String, crate::types::StackTrace>> 3512 | | where 3513 | | P: ::fbthrift::ProtocolWriter, | |______________________________________^ conflicting implementation for `LocalImpl<HashMap<std::string::String, StackTrace, FxBuildHasher>>` ``` Reviewed By: hchokshi Differential Revision: D117318441 fbshipit-source-id: 765204bc86f41cb0f7bb57e9d1db813289f0b637

Update ruff crates from 0.0.6 to 0.0.7 Reviewed By: diliop, samwgoldman Differential Revision: D117541787 fbshipit-source-id: fe9044d93cc95eef276f00397f98118c60b6f674

Update derive_more from 1.0.0 to 2.1.1 Summary: Release notes: https://github.com/JelteF/derive_more/blob/master/CHANGELOG.md Reviewed By: cjlongoria Differential Revision: D117462213 fbshipit-source-id: f2df54b8a9db70708b6b33afe923d87b694f7903

Update quick-xml from 0.37.5 to 0.38.4 Summary: Release notes: https://github.com/tafia/quick-xml/blob/master/Changelog.md Reviewed By: JakobDegen Differential Revision: D116165084 fbshipit-source-id: 694dbac49ccdec768a4191527049903d6e8f8290

Update logos from 0.15.1 to 0.16.1 Summary: Release notes: https://github.com/maciejhirsz/logos/releases/tag/v0.16 Migration guide: https://logos.maciej.codes/migrating.html#changes-in-0160 Reviewed By: stroxler Differential Revision: D117460949 fbshipit-source-id: b8046fa267dcfd7da04ddbf73a4e50abf2f91b62