diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-05-06 22:53:05 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-05-06 22:53:05 +0100 |
| commit | 6fccb152b4646877e38dc29dce1b0cd826eb6908 (patch) | |
| tree | 361153338ec7c32866a5477b3e7681d05a4b0b7c /crates/hir_def/src/nameres.rs | |
| parent | b37b709459a4ff881a91965ebf0c39e3a449c304 (diff) | |
| parent | 20ae41c1a12963e938cb3bd4c7c84007412d6fa6 (diff) | |
Merge #8746
8746: Don't store call-site text offsets in hygiene info r=matklad a=jonas-schievink
This threads a lot more database references around in order to avoid storing a bare `TextOffset` in the hygiene info. This `TextOffset` made hygiene info and `ItemTree`s more volatile than they should be, leading to excessive recomputation of `ItemTree`s.
The incremental test added in https://github.com/rust-analyzer/rust-analyzer/pull/8721 is now passing with these changes.
closes https://github.com/rust-analyzer/rust-analyzer/pull/8721
Co-authored-by: Jonas Schievink <[email protected]>
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/hir_def/src/nameres.rs')
| -rw-r--r-- | crates/hir_def/src/nameres.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/hir_def/src/nameres.rs b/crates/hir_def/src/nameres.rs index ba027c44a..1bc72ec1f 100644 --- a/crates/hir_def/src/nameres.rs +++ b/crates/hir_def/src/nameres.rs | |||
| @@ -599,6 +599,7 @@ mod diagnostics { | |||
| 599 | let mut cur = 0; | 599 | let mut cur = 0; |
| 600 | let mut tree = None; | 600 | let mut tree = None; |
| 601 | ModPath::expand_use_item( | 601 | ModPath::expand_use_item( |
| 602 | db, | ||
| 602 | InFile::new(ast.file_id, use_item), | 603 | InFile::new(ast.file_id, use_item), |
| 603 | &hygiene, | 604 | &hygiene, |
| 604 | |_mod_path, use_tree, _is_glob, _alias| { | 605 | |_mod_path, use_tree, _is_glob, _alias| { |