rust-analyzer subtree update

src/tools/rust-analyzer/CLAUDE.md

@@ -1,40 +1,60 @@
-**Reminder: All AI usage must be disclosed in commit messages, see
-CONTRIBUTING.md for more details.**
+## AI Policy
 
-## Build Commands
+Follow `AI_POLICY.md`. In particular:
 
-```bash
-cargo build                    # Build all crates
-cargo test                     # Run all tests
-cargo test -p <crate>          # Run tests for a specific crate (e.g., cargo test -p hir-ty)
-cargo lint                     # Run clippy on all targets
-cargo xtask codegen            # Run code generation
-cargo xtask tidy               # Run tidy checks
-UPDATE_EXPECT=1 cargo test     # Update test expectations (snapshot tests)
-RUN_SLOW_TESTS=1 cargo test    # Run heavy/slow tests
-```
+- Do not use AI to author issue/PR comments or replies to maintainers.
+- Do not autonomously open issues or pull requests.
+- Do not author code for issues labeled both `E-easy` and `E-has-instructions`.
+- The human contributor must understand the changes and disclose AI use as required by the policy.
 
-## Key Architectural Invariants
 
-- Typing in a function body never invalidates global derived data
-- Parser/syntax tree is built per-file to enable parallel parsing
-- The server is stateless (HTTP-like); context must be re-created from request parameters
-- Cancellation uses salsa's cancellation mechanism; computations panic with a `Cancelled` payload
+## Repository Guides
 
-### Code Generation
+- Architecture and crate ownership: `docs/book/src/contributing/architecture.md`
+- Rust style: `docs/book/src/contributing/style.md`
+- Testing conventions and fixture syntax: `docs/book/src/contributing/testing.md`
+- Contributor workflows: `docs/book/src/contributing/README.md`
+- AI restrictions: `AI_POLICY.md`
 
-Generated code is committed to the repo. Grammar and AST are generated from `ungrammar`. Run `cargo test -p xtask` after adding inline parser tests (`// test test_name` comments).
+Read the relevant sections before making architectural, generated-code, protocol, or test-harness changes.
+
+## Change Workflow
+
+- Find the nearest existing implementation and its tests before adding new code.
+- Extend existing helpers and test harnesses instead of creating parallel abstractions.
+- Keep changes focused and prefer the smallest change that fits the existing design.
+- When fixing a bug, add the smallest fixture that reproduces it and test the behavior through the existing interface.
+
+## Scope and Dependencies
+
+- Treat new `pub` items, public re-exports, and Cargo dependencies as architectural changes, not routine implementation details.
+- Prefer keeping functionality inside the crate that owns the relevant data.
+- Be conservative with crates.io dependencies. Reuse existing dependencies or `stdx`; do not add small helper crates without strong justification.
+
+## Key Invariants
+
+- User-provided Rust code, malformed syntax, broken builds, and proc-macro failures must not cause ordinary IDE features to panic.
+- Assert invariants liberally. For impossible conditions from which the server can recover, prefer `stdx::never!` or `stdx::always!` and return a safe fallback instead of panicking.
 
 ## Testing
 
-Tests are snapshot-based using `expect-test`. Test fixtures use a mini-language:
-- `$0` marks cursor position
-- `// ^^^^` labels attach to the line above
-- `//- minicore: sized, fn` includes parts of minicore (minimal core library)
-- `//- /path/to/file.rs crate:name deps:dep1,dep2` declares files/crates
+- Many feature tests use Rust-code fixtures and `expect-test` snapshots. Follow the nearest existing test helper and fixture convention rather than introducing a new test harness.
+- Before planning or writing fixture-based tests, review `docs/book/src/contributing/testing.md` for fixture annotations, `minicore`, and multi-file/multi-crate syntax.
+- Keep Rust fixtures minimal; remove syntax unrelated to the behavior under test.
+- Use unindented multiline raw strings, matching nearby tests.
+- For regressions, first reproduce the failure with a focused test, then implement the fix.
+
+## Generated Code
+
+- Generated files are committed. Edit the generator rather than generated output.
+- Run `cargo xtask codegen` after changing grammar, generated AST definitions, configuration schemas, or other codegen inputs.
+- After adding parser inline tests (`// test name`), run `cargo test -p xtask`, update the relevant expectations, and inspect the generated diff.
 
-## Style Notes
+## Validation
 
-- Use `stdx::never!` and `stdx::always!` instead of `assert!` for recoverable invariants
-- Use `T![fn]` macro instead of `SyntaxKind::FN_KW`
-- Use keyword name mangling over underscore prefixing for identifiers: `crate` → `krate`, `fn` → `func`, `struct` → `strukt`, `type` → `ty`
+- Start with the narrowest relevant test: `cargo test -p <crate> <test-name>` or `cargo test -p <crate>`.
+- After Rust changes, run the affected crate's tests and `cargo clippy -p <crate> --all-targets -- --cap-lints warn`; broaden validation when the change crosses crates.
+- Use `cargo lint` to run Clippy on all workspace targets.
+- Run `cargo xtask tidy` for repository-wide structural or generated-code changes.
+- When updating snapshots with `UPDATE_EXPECT=1`, inspect the expectation diff rather than accepting it blindly.
+- Use `RUN_SLOW_TESTS=1 cargo test` when the affected area has slow tests.

src/tools/rust-analyzer/Cargo.lock

@@ -95,7 +95,6 @@ dependencies = [
  "indexmap",
  "intern",
  "la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "query-group-macro",
  "rustc-hash 2.1.2",
  "salsa",
  "salsa-macros",
@@ -825,6 +824,7 @@ dependencies = [
  "la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ra-ap-rustc_type_ir",
  "rustc-hash 2.1.2",
+ "salsa",
  "serde_json",
  "smallvec",
  "span",
@@ -863,7 +863,6 @@ dependencies = [
  "rustc-hash 2.1.2",
  "rustc_apfloat",
  "salsa",
- "salsa-macros",
  "smallvec",
  "span",
  "stdx",
@@ -892,7 +891,6 @@ dependencies = [
  "parser",
  "rustc-hash 2.1.2",
  "salsa",
- "salsa-macros",
  "smallvec",
  "span",
  "stdx",
@@ -925,7 +923,6 @@ dependencies = [
  "oorandom",
  "petgraph",
  "project-model",
- "query-group-macro",
  "ra-ap-rustc_abi",
  "ra-ap-rustc_ast_ir",
  "ra-ap-rustc_index",
@@ -935,7 +932,6 @@ dependencies = [
  "rustc-hash 2.1.2",
  "rustc_apfloat",
  "salsa",
- "salsa-macros",
  "serde",
  "serde_derive",
  "smallvec",
@@ -1136,7 +1132,6 @@ dependencies = [
  "rayon",
  "rustc-hash 2.1.2",
  "salsa",
- "salsa-macros",
  "smallvec",
  "span",
  "stdx",
@@ -2037,18 +2032,6 @@ dependencies = [
  "pulldown-cmark",
 ]
 
-[[package]]
-name = "query-group-macro"
-version = "0.0.0"
-dependencies = [
- "expect-test",
- "proc-macro2",
- "quote",
- "salsa",
- "salsa-macros",
- "syn",
-]
-
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -2484,6 +2467,7 @@ dependencies = [
  "smallvec",
  "thin-vec",
  "tracing",
+ "triomphe",
  "typeid",
 ]
 
@@ -3089,6 +3073,10 @@ name = "triomphe"
 version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd69c5aa8f924c7519d6372789a74eac5b94fb0f8fcf0d4a97eb0bfc3e785f39"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+]
 
 [[package]]
 name = "tt"

src/tools/rust-analyzer/Cargo.toml

@@ -131,6 +131,7 @@ salsa = { version = "0.27.0", default-features = false, features = [
     "salsa_unstable",
     "macros",
     "inventory",
+    "triomphe"
 ] }
 salsa-macros = "0.27.0"
 semver = "1.0.26"

src/tools/rust-analyzer/crates/base-db/Cargo.toml

@@ -17,7 +17,6 @@ la-arena.workspace = true
 dashmap.workspace = true
 salsa.workspace = true
 salsa-macros.workspace = true
-query-group.workspace = true
 rustc-hash.workspace = true
 triomphe.workspace = true
 semver.workspace = true

src/tools/rust-analyzer/crates/base-db/src/editioned_file_id.rs

@@ -16,57 +16,24 @@ pub struct EditionedFileId {
     field: span::EditionedFileId,
 }
 
-// Currently does not work due to a salsa bug
-// #[salsa::tracked]
-// impl EditionedFileId {
-//     #[salsa::tracked(lru = 128)]
-//     pub fn parse(self, db: &dyn SourceDatabase) -> syntax::Parse<ast::SourceFile> {
-//         let _p = tracing::info_span!("parse", ?self).entered();
-//         let (file_id, edition) = self.unpack(db);
-//         let text = db.file_text(file_id).text(db);
-//         ast::SourceFile::parse(text, edition)
-//     }
-
-//     // firewall query
-//     #[salsa::tracked(returns(as_deref))]
-//     pub fn parse_errors(self, db: &dyn SourceDatabase) -> Option<Box<[SyntaxError]>> {
-//         let errors = self.parse(db).errors();
-//         match &*errors {
-//             [] => None,
-//             [..] => Some(errors.into()),
-//         }
-//     }
-// }
-
+#[salsa::tracked]
 impl EditionedFileId {
+    #[salsa::tracked(lru = 128)]
     pub fn parse(self, db: &dyn SourceDatabase) -> syntax::Parse<ast::SourceFile> {
-        #[salsa::tracked(lru = 128)]
-        pub fn parse(
-            db: &dyn SourceDatabase,
-            file_id: EditionedFileId,
-        ) -> syntax::Parse<ast::SourceFile> {
-            let _p = tracing::info_span!("parse", ?file_id).entered();
-            let (file_id, edition) = file_id.unpack(db);
-            let text = db.file_text(file_id).text(db);
-            ast::SourceFile::parse(text, edition)
-        }
-        parse(db, self)
+        let _p = tracing::info_span!("parse", ?self).entered();
+        let (file_id, edition) = self.unpack(db);
+        let text = db.file_text(file_id).text(db);
+        ast::SourceFile::parse(text, edition)
     }
 
     // firewall query
-    pub fn parse_errors(self, db: &dyn SourceDatabase) -> Option<&[SyntaxError]> {
-        #[salsa::tracked(returns(as_deref))]
-        pub fn parse_errors(
-            db: &dyn SourceDatabase,
-            file_id: EditionedFileId,
-        ) -> Option<Box<[SyntaxError]>> {
-            let errors = file_id.parse(db).errors();
-            match &*errors {
-                [] => None,
-                [..] => Some(errors.into()),
-            }
+    #[salsa::tracked(returns(as_deref))]
+    pub fn parse_errors(self, db: &dyn SourceDatabase) -> Option<Box<[SyntaxError]>> {
+        let errors = self.parse(db).errors();
+        match &*errors {
+            [] => None,
+            [..] => Some(errors.into()),
         }
-        parse_errors(db, self)
     }
 }
 

src/tools/rust-analyzer/crates/base-db/src/input.rs

@@ -447,7 +447,7 @@ impl BuiltDependency {
 
 pub type CratesIdMap = FxHashMap<CrateBuilderId, Crate>;
 
-#[salsa_macros::input]
+#[salsa::input]
 #[derive(Debug, PartialOrd, Ord)]
 pub struct Crate {
     #[returns(ref)]