diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-03 10:48:41 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-03 10:48:41 +0000 |
commit | b47c63a4bcefe93be3e5fe97b2a57489f13da493 (patch) | |
tree | f02b994b580aacd64a3b8172a17fa464a52b4713 /crates/hir_def/src | |
parent | 354c1daedc91abd15ca0ce6ada417053ce45ecfa (diff) | |
parent | 85cc3cfec99a7d232384efae010bfbc8224f1351 (diff) |
Merge #7137
7137: Revert "Proper handling $crate and local_inner_macros" r=jonas-schievink a=jonas-schievink
Reverts rust-analyzer/rust-analyzer#7133
It caused a fairly significant performance regression.
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_def/src')
-rw-r--r-- | crates/hir_def/src/path/lower.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_def/src/path/lower.rs b/crates/hir_def/src/path/lower.rs index 9518ac109..8a01e6eea 100644 --- a/crates/hir_def/src/path/lower.rs +++ b/crates/hir_def/src/path/lower.rs | |||
@@ -123,7 +123,7 @@ pub(super) fn lower_path(mut path: ast::Path, hygiene: &Hygiene) -> Option<Path> | |||
123 | // We follow what it did anyway :) | 123 | // We follow what it did anyway :) |
124 | if segments.len() == 1 && kind == PathKind::Plain { | 124 | if segments.len() == 1 && kind == PathKind::Plain { |
125 | if let Some(_macro_call) = path.syntax().parent().and_then(ast::MacroCall::cast) { | 125 | if let Some(_macro_call) = path.syntax().parent().and_then(ast::MacroCall::cast) { |
126 | if let Some(crate_id) = hygiene.local_inner_macros(path) { | 126 | if let Some(crate_id) = hygiene.local_inner_macros() { |
127 | kind = PathKind::DollarCrate(crate_id); | 127 | kind = PathKind::DollarCrate(crate_id); |
128 | } | 128 | } |
129 | } | 129 | } |