Wilfred Hughes

This commit **reduces the verbosity of logging** within the **`rust-project` integration** by adjusting the logging level for BUCK paths. Specifically, the `query_targets` function in `integrations/rust-project/src/buck.rs` now logs information about found targets at the `debug` level instead of `info`. This **maintenance** change prevents logs from becoming overwhelming when `rust-project` is invoked with a large number of targets, thereby improving the clarity and usability of the output.

This commit **fixes a bug** in the **`rust-project` integration** that caused duplicate sysroot targets to appear in generated CLI arguments. Specifically, the `get_sysroot_targets` function within `integrations/rust-project/src/buck.rs` has been updated to **deduplicate and sort** the list of sysroot targets. This **bug fix** ensures that when `rust-project` is invoked with multiple targets, the resulting command-line arguments are clean and free of redundant sysroot entries, improving the correctness and efficiency of the build process.

This commit **adds support for collecting Buck target labels**, enhancing the metadata available within the `rust-project` integration. A new `labels` field is introduced to the **`TargetInfo` struct** in `integrations/rust-project/src/target.rs`, and the **`resolve_deps.bxl` script** is updated to extract and populate this information from target configurations. This **new capability** allows `rust-project` to leverage target-associated tags, simplifying subsequent processing and analysis of Rust targets. While not a direct logic change, this **data enrichment** streamlines the overall stack by making target labels readily accessible for downstream components.

This commit provides a **bug fix** to improve **file watching** for generated code within the **`rust-project` integration** by modifying how include directories are processed. Specifically, it addresses an issue where `rust-analyzer`'s VFS failed to track changes in `__srcs/` directories, which are deleted and recreated during code generation. The fix in `integrations/rust-project/src/buck.rs`'s `to_project_json` function now replaces `__srcs/` directories with their parent directories in the watched paths, allowing the file watcher to correctly observe the recreation of generated files. This **enhances developer experience** by enabling `rust-analyzer` to reliably pick up changes to **generated Thrift files** and other generated code.

This commit **enhances the `rust-analyzer` integration** by ensuring that generated code is properly included in its workspace, allowing the language server to watch and analyze these files. A new method `is_workspace_member()` is introduced in `integrations/rust-project/src/target.rs` to determine if a target, including those with generated code labels, should be considered a workspace member. The `integrations/rust-project/src/buck.rs` module is updated to leverage this new logic. This **tooling improvement** allows `rust-analyzer` to automatically pick up changes in **Rust code generated from Thrift**, significantly improving the development workflow and analysis for such components.

This commit **improves the display of target names** for **Rust proc-macro crates** within the `integrations/rust-project` module. Previously, the `display_name` function did not correctly process target names containing underscores, leading to malformed output for entries like `fbsource//third-party/rust/vendor/derive_more-impl:_2.1.0`. This **maintenance fix** updates the `display_name` function in `src/target.rs` to properly handle these underscore-delimited names, ensuring **accurate and readable display names** for these specific Rust targets. A new test case has been added to validate this improved parsing logic.

This commit **enhances the `rust-project` integration** to **support multiple `fbsource` checkouts**, addressing a bug where `rust-analyzer` would incorrectly invoke Buck BXL scripts from the wrong project directory. The **bug fix** introduces logic within `src/main.rs` to dynamically determine the correct project root for a given file, then passes this root through `src/cli/develop.rs` to the `Buck` struct in `src/buck.rs`. This ensures all subsequent **Buck invocations** are executed from the specific project root, preventing errors caused by cross-checkout file references and **unblocking users** working with multiple checkouts.

This commit **refactors** the diagnostic deduplication logic within the **`rust-project` integration's `check` command** to correctly handle changes introduced in Rust 1.91+. Specifically, it modifies the `parse_diagnostics` function in `integrations/rust-project/src/cli/check.rs` to consider diagnostics identical based on their message and spans, ignoring minor, non-semantic details like build directory paths. This **bug fix** restores proper deduplication, preventing redundant error messages and improving the clarity of `rust-project` output for users on Rust 1.91 and newer.

This commit **refactors** the `integrations/rust-project` module by extracting the logic for parsing `rustc` diagnostics into a dedicated helper. The diagnostic parsing code from the `run` method in `cli/check.rs` has been moved into a new function, `parse_diagnostics`, which now includes its own unit tests, significantly improving the **testability** of this component. This is a **code organization and maintenance improvement**, introducing no functional changes but preparing the codebase for simpler future modifications. Additionally, documentation for the `Message` struct in `diagnostics.rs` was updated to clarify its relation to `rustc`'s JSON diagnostics schema.

This commit introduces a **maintenance refactoring** across several **Buck2 modules** to explicitly add `'static` lifetime annotations to various string literals. Specifically, it modifies string constants within `buck2_cmd_completion_client`, `buck2_execute_impl`, `buck2_health_check`, and `buck2_node`. This change serves as a **workaround** for a known `rust-analyzer` bug where pattern matching on non-`'static` string literals can cause the IDE service to crash. By ensuring these literals are `'static`, the commit **prevents `rust-analyzer` crashes** and guarantees **reliable Rust IDE functionality** for developers working on the Buck2 codebase.

This commit **re-enables the `json_args_pass` test** within the `integrations/rust-project` module, which was previously ignored due to `sysroot` configuration differences between build environments. It specifically enables this test for **`fbcode` builds** by removing the `#[ignore]` attribute and adjusting test parameters like `sysroot_mode` and `max_extra_targets`. This **test maintenance** ensures that a critical part of the **Rust project integration** is now properly validated in the `fbcode` environment, improving overall test coverage and reliability.

This commit introduces a **performance optimization** and **bug fix** for the **`rust-project` integration** by refining how sysroot crates are identified. It implements a new filtering mechanism that limits the queried sysroot targets to only those reachable from the current project's targets, rather than including all possible targets. This is achieved by adding a new function `query_sysroot_targets` in `integrations/rust-project/src/buck.rs` and integrating it into `resolve_buckconfig_sysroot` within `integrations/rust-project/src/sysroot.rs`. This change resolves issues with overly large sysroot queries, irrelevant cross-platform targets, and Windows-specific errors, resulting in **faster `rust-project` execution** and **reduced data transfer to `rust-analyzer`**.

This commit introduces a **performance optimization** within the **Rust project integration** by preventing redundant queries to Buck. It modifies the `query_expanded_targets` and `expand_aliases` functions in `integrations/rust-project/src/buck.rs` to **deduplicate and sort target lists** before they are passed to Buck. This addresses a scenario where the same target might be queried multiple times due to differing configurations, reducing unnecessary load and improving efficiency. This is an interim **fix** to avoid duplicate arguments while a more comprehensive deduplication solution is being prepared, directly impacting the efficiency of **target expansion and alias resolution**.

This commit introduces a **new feature** to the **`rust-project` integration** by enhancing its interaction with **Buck commands**. It modifies `integrations/rust-project/src/buck.rs` to **parse and log Buck UI URLs** that appear in the `stderr` output of executed Buck commands. This improvement makes it significantly easier for developers to access detailed build information by providing direct links to the Buck UI, thereby enhancing debugging and observability for `rust-project` users.

This commit **fixes** an issue within the **Rust project integration** (`integrations/rust-project`) where Buck's `owner()` queries were unable to locate targets defined in parent directories. It modifies the Buck command arguments in `buck.rs` to explicitly include `project.package_boundary_exceptions=.`. This ensures that the `owner()` command can correctly traverse the directory hierarchy to find relevant `BUCK` files. The change improves the robustness of project generation and dependency resolution for Rust projects that utilize targets defined outside their immediate directory.

This commit primarily **improves the clarity of user-facing documentation** for the **Buck2 Starlark API**. It updates doc comments within the `buck2_build_api` module to consistently use **user-facing type names** such as `Artifact` and `OutputArtifact` for methods like `as_output`, aligning with how users interact with these types in Starlark. This **documentation maintenance** ensures that the official Buck2 website accurately reflects the API, preventing confusion caused by internal type names like `StarlarkArtifact`. Additionally, a minor typo was corrected in the `buck2_bxl` module's doc comments, further enhancing the overall quality of the documentation.

This commit **enhances the `repr()`** (string representation) of **Starlark artifacts** within the `buck2_build_api` interpreter. Specifically, it modifies the `Display` implementation for **source artifacts** to consistently include the word "artifact" in their printed form, aligning them with build and output artifacts. This **usability improvement** prevents confusion with other Starlark types, significantly aiding in debugging and logging by providing clearer, more consistent output. Associated test files in `buck2_build_api_tests` and `bxl` were updated to reflect these new expected string formats.

This commit **improves the diagnostic quality** of `buck2` by enhancing error messages for non-existent directories. It **fixes an issue** within the **`buck2_common` package listing interpreter** where error suggestions for misspelled subdirectories were incomplete and often invalid. Now, when a typo is detected, the error message will provide a **full and accurate path suggestion**, significantly improving user guidance. This **enhancement to error reporting** directly impacts the **user experience** by providing more actionable feedback and reducing confusion when resolving target path issues.

This commit **refines the `rust-project` integration** by preventing the collection of extra build targets from `third-party/rust/vendor/` directories. Previously, the system would load additional targets from the same BUCK file, which was problematic for vendor directories containing multiple versions or platform-specific variants of the same library. This **bug fix** addresses issues where **Rust Analyzer** could display incorrect hover information (e.g., showing an Apple-specific target for a non-Apple context) due to these superfluous targets. By modifying the target resolution logic in `prelude/rust/rust-analyzer/resolve_deps.bxl`, the system now only collects extra targets from first-party code, thereby **improving the accuracy and efficiency of the Rust development environment**.

This commit **refactors** the **discovery protocol's JSON output** within the **Rust project integration** to enhance readability and consistency. It renames internal data structures, such as `OutputData` to `DiscoverProjectFinished` and `Out` to `DiscoverProjectEvent`, for clearer type identification in `cli/develop.rs` and `progress.rs`. A key aspect of this **maintenance** work is ensuring the `kind` field is always prioritized and placed first in the serialized JSON output, which significantly aids in testing and debugging. The `make_event` function in `progress.rs` is also updated to correctly serialize these newly structured events. This improves the overall user experience when interacting with the discovery protocol's output.